diff --git a/.gitignore b/.gitignore
index 327e0f807..d33e035e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ out
 .debugger/
 .razor/
 .razoromnisharp/
+.razortelemetry/
 .vscode-test/
 dist/
 *.razor.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
index ff9812299..cd6b1f06c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -15,6 +15,34 @@
             ],
             "preLaunchTask": "buildDev"
         },
+        {
+            "name": "Launch Current File slnWithCsproj Integration Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                // Create a temp profile that has no extensions / user settings.
+                // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
+                "--profile-temp",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests",
+            ],
+            "env": {
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "TEST_FILE_FILTER": "${file}"
+            },
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/dist/*.js",
+                "${workspaceRoot}/out/test/**/*.js"
+            ],
+            "resolveSourceMapLocations": [
+                "${workspaceFolder}/**",
+                "!**/node_modules/**"
+            ],
+            "preLaunchTask": "buildDev"
+        },
         {
             "type": "node",
             "request": "launch",
@@ -66,7 +94,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj",
+                "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_singleCsproj.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -90,7 +118,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1",
+                "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -108,7 +136,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -123,30 +151,6 @@
             ],
             "preLaunchTask": "buildDev"
         },
-        {
-            "name": "LSP Tools Host: Launch slnWithCsproj Workspace Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                // Create a temp profile that has no extensions / user settings.
-                // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
-                "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests",
-            ],
-            "env": {
-                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
-                "OSVC_SUITE": "slnWithCsproj",
-            },
-            "sourceMaps": true,
-            "outFiles": [
-                "${workspaceRoot}/dist/*.js",
-                "${workspaceRoot}/out/test/**/*.js"
-            ],
-            "preLaunchTask": "buildDev"
-        },
         {
             "name": "Omnisharp: Launch singleCsproj Workspace Tests [LSP]",
             "type": "extensionHost",
@@ -156,7 +160,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
+                "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_lsp_singleCsproj.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -180,7 +184,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1",
+                "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -198,7 +202,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -222,7 +226,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -246,7 +250,7 @@
                 // Create a temp profile that has no extensions / user settings.
                 // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
                 "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
             ],
@@ -271,8 +275,9 @@
                 "updatePackageDependencies"
             ],
             "env": {
-                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x86-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-arm64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x86-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-arm64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-musl-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-musl-arm64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-arm64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-arm64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x86-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-arm64-net6.0-1.39.7.zip",
-                "NEW_DEPS_VERSION": "1.39.7"
+                "NEW_DEPS_ID": "OmniSharp",
+                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x86-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-arm64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-arm64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-net6.0-1.39.10.zip",
+                "NEW_DEPS_VERSION": "1.39.10"
             },
             "cwd": "${workspaceFolder}"
         },
@@ -286,11 +291,49 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/4aca138f5c6299422e240dcc50689a67/razorlanguageserver-linux-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/eee386c129c18ba1705fe411cb981a20/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/7d1e4e0bf72de43dc272d22de2486633/razorlanguageserver-linux-musl-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/b9653cb6c40f965986266f70ae7dab25/razorlanguageserver-linux-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/679c6fe63c016298914264c33326f2ea/razorlanguageserver-osx-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/74f8a06bc496f54b37466c382c6744ee/razorlanguageserver-osx-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/695b332017bfa81af74787904979fde8/razorlanguageserver-win-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/a48c3e83b44a34ddb295099c55e31e7e/razorlanguageserver-win-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/e188fa3cbd9a5601701d0f8de0705496/razorlanguageserver-win-x86-7.0.0-preview.23423.3.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.23423.3",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/bb7cd0c44e45bd21cd1341a4a6e87f1c/razorlanguageserver-linux-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/159a171a7cc1ceb96604d148d5c75574/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/fb08013aad8cfbb2bc2c3f5f4d276a0d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/5ece63dde175c03ce79a8ec91005537b/razorlanguageserver-linux-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/89a58de8daaea554d00105dc435dfc98/razorlanguageserver-osx-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/8a13539f57d6e59b32e767d3684c6c84/razorlanguageserver-osx-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/efe8ebdcd7f4162a537acb9325234f02/razorlanguageserver-win-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/e0d9dc729905a672edb6bb44239fceb0/razorlanguageserver-win-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/c7f08527fbb3809f6dc8e4bf2dc81571/razorlanguageserver-win-x86-7.0.0-preview.23513.5.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.23513.5",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
-      }
+      },
+      {
+        "type": "node",
+        "request": "launch",
+        "name": "Update razor telemetry package dependencies",
+        "preLaunchTask": "build",
+        "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
+        "args": [
+            "updatePackageDependencies"
+        ],
+        "env": {
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/0b23b6f3f7cf31d231ba6205284521e9/devkittelemetry-linux-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/50b2adf5ee4be81c408b5abb88ab9742/devkittelemetry-linux-musl-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/d6e1c30239e8980a395c4c01cb6b867b/devkittelemetry-linux-musl-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/b4f2fb72ed2acda7263fc597fbd20882/devkittelemetry-linux-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/c1bda24c3a3a8ec6bbe3a7e28636d0b1/devkittelemetry-osx-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/3c1a78bd8fd33577f8691e122872e63e/devkittelemetry-osx-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/6f665a1dfe1d43fded3df2ddd0928236/devkittelemetry-win-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/187a09b50228410a03d7e264181e2503/devkittelemetry-win-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/bd39a95d100683454ee49cfce0a498b9/devkittelemetry-win-x86-7.0.0-preview.23475.5.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.23475.5",
+            "NEW_DEPS_ID": "RazorTelemetry"
+        },
+        "cwd": "${workspaceFolder}"
+    },
+    {
+        "type": "node",
+        "request": "launch",
+        "name": "Generate debugger options schema",
+        "preLaunchTask": "build",
+        "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
+        "args": [
+            "generateOptionsSchema"
+        ],
+        "cwd": "${workspaceFolder}"
+    },
+    {
+        "type": "node",
+        "request": "launch",
+        "name": "Razor integration tests",
+        "preLaunchTask": "build",
+        "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
+        "args": [
+            "test:razorintegration"
+        ],
+        "cwd": "${workspaceFolder}"
+    }
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0c125a0b2..a67f54a97 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -20,5 +20,6 @@
     "omnisharp.autoStart": false,
     "editor.formatOnSave": false,
     "eslint.lintTask.enable": true,
-    "dotnet.defaultSolution": "disable"
+    "dotnet.defaultSolution": "disable",
+    "jest.autoRun": "off"
 }
diff --git a/.vscodeignore b/.vscodeignore
index 85974d63b..71964e020 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -5,6 +5,7 @@
 !.omnisharp/**
 !.razor/**
 !.razoromnisharp/**
+!.razortelemetry/**
 .rpt2_cache/**
 .github/**
 .vscode/**
@@ -15,6 +16,11 @@ server/**
 src/**
 tasks/**
 test/**
+omnisharptest/**
+__mocks__/**
+jest.config.ts
+baseJestConfig.ts
+.prettierignore
 typings/**
 vsix/**
 node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ed84c401..68bd37ef7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,116 @@
 ## Known Issues
- 
+
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
-- [O# Parity] FixAll support for code fixes and refactorings [#5735](https://github.com/dotnet/vscode-csharp/issues/5735)
+- [O# Parity] Nested code code action support for code fixes and refactorings [#5735](https://github.com/dotnet/vscode-csharp/issues/5735)
 - [O# Parity] Nuget restore [#5725](https://github.com/dotnet/vscode-csharp/issues/5725)
-- [O# Parity] Support loading projects/files without a solution file [#5722](https://github.com/dotnet/vscode-csharp/issues/5722)
-- [O# Parity] Some csproj projects will not correctly load [#5721](https://github.com/dotnet/vscode-csharp/issues/5721)
-- [O# Parity] Run and debug tests in context [#5719](https://github.com/dotnet/vscode-csharp/issues/5719)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Update Razor to 7.0.0-preview.23513.5 (PR: [#6551](https://github.com/dotnet/vscode-csharp/pull/6551))
+  * Reduce noisy errors when viewing git diff (PR: [razor#9407](https://github.com/dotnet/razor/pull/9407))
+* Update Roslyn to 4.9.0-1.23513.7 (PR: [#6548](https://github.com/dotnet/vscode-csharp/pull/6548))
+  * Fix extraneous error when connecting to devkit (PR: [#70298](https://github.com/dotnet/roslyn/pull/70298))
+  * Add support for using Mono to load .NET Framework projects on macOS and Linux (PR: [#70263](https://github.com/dotnet/roslyn/pull/70263))
+  * Fix source generator and analyzer output not being recognized if you didn't have C# Dev Kit installed (PR: [#70331](https://github.com/dotnet/roslyn/pull/70331))
+* Hide debug console when using `"console": "integratedTerminal"` (PR: [#6523](https://github.com/dotnet/vscode-csharp/pull/6523))
+* Fix dotnet path resolution when using snap installed packages (PR: [#6515](https://github.com/dotnet/vscode-csharp/pull/6515))
+* Track debugging sessions until csdevkit is initialized (PR: [#6480](https://github.com/dotnet/vscode-csharp/pull/6480))
+* Update vsdbg and vsdbg-ui to 2.0.4 (PR: [#6517](https://github.com/dotnet/vscode-csharp/pull/6517))
+* Add setting to control Razor component commit behaviour (PR: [#6506](https://github.com/dotnet/vscode-csharp/pull/6506))
+* Razor textmate colorization fixes (PR: [#6514](https://github.com/dotnet/vscode-csharp/pull/6514))
+* Update Razor version to 7.0.0-preview.23475.5 (PR: [#6506](https://github.com/dotnet/vscode-csharp/pull/6506))
+  * Add setting for whether to complete components with space (PR: [razor#9379](https://github.com/dotnet/razor/pull/9379))
+
+## 2.6.24
+* Update Roslyn version to 4.9.0-1.23506.7 (PR: [#6447](https://github.com/dotnet/vscode-csharp/pull/6447))
+  * Fix various issues with project loading and allow fallbacks to .NET framework msbuild (PR: [#70240](https://github.com/dotnet/roslyn/pull/70240))
+* Fix some Razor colorization issues (PR: [#6502](https://github.com/dotnet/vscode-csharp/pull/6502))
+* Fire telemetry if Razor buffers get out of sync, and recover from same (PR: [#6494](https://github.com/dotnet/vscode-csharp/pull/6494))
+* Update OmniSharp to 1.39.10 (PR: [#6491](https://github.com/dotnet/vscode-csharp/pull/6491))
+  * Add RazorComplier EA to support razor generators (PR: [omnisharp-roslyn#2572](https://github.com/OmniSharp/omnisharp-roslyn/pull/2572))
+  * Add Kind parameter to InlayHint (PR: [omnisharp-roslyn#2570](https://github.dev/OmniSharp/omnisharp-roslyn/pull/2570))
+  * Do not include commit characters if the typed span is empty (PR: [omnisharp-roslyn#2569](https://github.com/OmniSharp/omnisharp-roslyn/pull/2569))
+  * Update Roslyn to version 4.9.0-1.23504.3 (PR: [omnisharp-roslyn#2567](https://github.com/OmniSharp/omnisharp-roslyn/pull/2567))
+  * Async diagnostics analyzer work queue (PR: [omnisharp-roslyn#2351](https://github.com/OmniSharp/omnisharp-roslyn/pull/2351))
+  * Add InlayHint implementation to OmniSharp.LSP (PR: [omnisharp-roslyn#2566](https://github.com/OmniSharp/omnisharp-roslyn/pull/2566))
+  * Include the project file name when invoking `dotnet build` (PR: [omnisharp-roslyn#2565](https://github.com/OmniSharp/omnisharp-roslyn/pull/2565))
+  * feat: ignore diagnostics for generated code (PR: [omnisharp-roslyn#2509](https://github.com/OmniSharp/omnisharp-roslyn/pull/2509))
+  * Update documentation to reflect --stdio flag deprecation (#2439) (PR: [omnisharp-roslyn#2554](https://github.com/OmniSharp/omnisharp-roslyn/pull/2554))
+  * Update Roslyn to version 4.8.0-1.23374.10 (PR: [omnisharp-roslyn#2555](https://github.com/OmniSharp/omnisharp-roslyn/pull/2555))
+  * Use double quote when quoting un script path (PR: [omnisharp-roslyn#2553](https://github.com/OmniSharp/omnisharp-roslyn/pull/2553))
+  * Use core LSP TokenTypes where possible and validate token names (PR: [omnisharp-roslyn#2548](https://github.com/OmniSharp/omnisharp-roslyn/pull/2548))
+* Add Razor C# semantic tokens support in VS Code (PR: [#6489](https://github.com/dotnet/vscode-csharp/pull/6489))
+* Update Roslyn version to 4.9.0-1.23502.8 (PR: [#6447](https://github.com/dotnet/vscode-csharp/pull/6447))
+  * Update Razor project configuration file name (PR: [#70156](https://github.com/dotnet/roslyn/pull/70156))* added support.md file (PR: [#6478](https://github.com/dotnet/vscode-csharp/pull/6478))
+* Debugger: Improve the display of various debug configurations and snippets (PR: [#6456](https://github.com/dotnet/vscode-csharp/pull/6456))
+* Initialize Razor even if Razor doc isn't opened yet (PR: [#6473](https://github.com/dotnet/vscode-csharp/pull/6473))
+* Debugger: better handle long strings ([#6496](https://github.com/dotnet/vscode-csharp/issues/6496)). Strings are truncated if they are longer than 1024 UTF-16 characters, but the full value  up to 5,242,880 characters or 10 megabytes, is available using 'Copy Value' in the watch or variables window. Truncated strings will end with '...'.
+
+## 2.5.30
+* Add code action fix all support (PR: [#6310](https://github.com/dotnet/vscode-csharp/pull/6310))
+* Update Roslyn version to 4.9.0-1.23502.2 (PR: [#6463](https://github.com/dotnet/vscode-csharp/pull/6463))
+  * Fix issue loading projects on .NET 8 RC2 (PR: [#70196](https://github.com/dotnet/roslyn/pull/70196))
+  * Fix exception thrown by outdated version of ExternalAccess.RazorCompiler.dll (PR: [#70716](https://github.com/dotnet/roslyn/pull/70176))
+  * Fix crash when navigating to .NET Framework reference assemblies (PR: [#69936](https://github.com/dotnet/roslyn/pull/69936))
+  * Fix error when only the invariant culture is available (PR: [#70096](https://github.com/dotnet/roslyn/pull/70096))
+* Update Razor version to 7.0.0-preview.23475.5 (PR: [#6449](https://github.com/dotnet/vscode-csharp/pull/6449))
+  * Add Razor language server telemetry when DevKit is installed (PR: [#9283](https://github.com/dotnet/razor/pull/9283))
+  * Use message pack for project.razor.* configuration file (PR: [#9270](https://github.com/dotnet/razor/pull/9270))
+* Fix issues with Razor completion (PR: [#6441](https://github.com/dotnet/vscode-csharp/pull/6441))
+* Add option to collect crash dumps on language server crash (PR: [#6438](https://github.com/dotnet/vscode-csharp/pull/6438))
+* Add support for multilaunch for Blazorwasm (PR: [#6432](https://github.com/dotnet/vscode-csharp/pull/6432))
+* Fix issue in Razor new file formatting (PR: [#6429](https://github.com/dotnet/vscode-csharp/pull/6429))
+* Fix issue in debug tests where tests would complete before the debugger attached (PR: [#6415](https://github.com/dotnet/vscode-csharp/pull/6415))
+* Hide certain debugger launch configurations when devkit is installed (PR: [#6405](https://github.com/dotnet/vscode-csharp/pull/6405))
+* Fix issue where build errors were not parsed correctly in the problems list (PR: [#6340](https://github.com/dotnet/vscode-csharp/pull/6340))
+* Update debugger packages to 2.0.3 (PR: [#6401](https://github.com/dotnet/vscode-csharp/pull/6401))
+
+## 2.4.4
+* Respect `dotnet.preferCSharpExtension` option (PR: [#6390](https://github.com/dotnet/vscode-csharp/pull/6390))
+
+## 2.3.27
+* Update Roslyn version to 4.8.0-3.23470.7 (PR: [#6408](https://github.com/dotnet/vscode-csharp/pull/6408))
+  * Update NuGet version to fix issues loading projects with .NET 8 RC2 (PR: [#70023](https://github.com/dotnet/roslyn/pull/70023))
+  * Update MSBuildLocator version to fix issues loading projects when only .NET 6 is installed (PR: [#70038](https://github.com/dotnet/roslyn/pull/70038))
+  * Remove diagnostic source name (PR: [#69939](https://github.com/dotnet/roslyn/pull/69939))
+  * Fix fold all regions (PR: [#69817](https://github.com/dotnet/roslyn/pull/69817))
+  * Fix escaping and wrapping in hover (PR: [#69893](https://github.com/dotnet/roslyn/pull/69893))
+  * Fix error in override completion when containing type does not exist (PR: [#69855](https://github.com/dotnet/roslyn/pull/69855))
+* Fix issues generating assets in Omnisharp (PR: [#6380](https://github.com/dotnet/vscode-csharp/pull/6380))
+* Allow Razor to format new documents via Roslyn (PR: [#6329](https://github.com/dotnet/vscode-csharp/pull/6329))
+* Switch to named pipes for client <-> server communication (PR: [#6351](https://github.com/dotnet/vscode-csharp/pull/6351))
+* Only show clr debugger if on Windows (PR: [#6359](https://github.com/dotnet/vscode-csharp/pull/6359))
+* Update Razor version to 7.0.0-preview.23456.2 (PR: [#6304](https://github.com/dotnet/vscode-csharp/pull/6304))
+  * Fixes regression where semantic colors for razor components appear as red
+* Make completion complex text edits more robust (PR: [#6325](https://github.com/dotnet/vscode-csharp/pull/6325))
+* Fix dotnet info when the dotnet path contains spaces (PR: [#6334](https://github.com/dotnet/vscode-csharp/pull/6334))
+* Add support for specifying a .runsettings file when using Roslyn LSP (PR: [#6265](https://github.com/dotnet/vscode-csharp/pull/6265))
+* Update Roslyn version (PR: [#6265](https://github.com/dotnet/vscode-csharp/pull/6265))
+  * Add server support for .runsettings in unit tests (PR: [#69792](https://github.com/dotnet/roslyn/pull/69792))
+  * Log more information when we're unable to parse a URI (PR: [#69840](https://github.com/dotnet/roslyn/pull/69840))
+  * Bump ICSharpCode.Decompiler to 8.1.0.745 (PR: [#69772](https://github.com/dotnet/roslyn/pull/69772))
+  * Fix override completion erroring when framework assemblies are not found (PR: [#69795](https://github.com/dotnet/roslyn/pull/69795))
+* Remove test only files from vsix (PR: [#6332](https://github.com/dotnet/vscode-csharp/pull/6332))
+* Fix override completion when drive letter casing does not match (PR: [#6315](https://github.com/dotnet/vscode-csharp/pull/6315))
+* Allow the server path to be specified by the `DOTNET_ROSLYN_SERVER_PATH` environment variable (PR: [#6316](https://github.com/dotnet/vscode-csharp/pull/6316))
+
+## 2.2.10
+* Update Roslyn version
+  * Includes better support for .NET 8 and .NET Framework-targeting projects (PR: [#69616](https://github.com/dotnet/roslyn/pull/69616))
+    * This should fix a number of reports where projects don't have full IntelliSense. .NET Framework projects on Windows should load without errors. .NET Framework targeting projects on Mac and Linux which would use Mono are still processed as if they are .NET Core projects and may not load correctly; support for Mono is coming in a future update.
+  * Fix issues where some projects fail to load being unable to find NuGet.Frameworks (PR: [#69824](https://github.com/dotnet/roslyn/pull/69824))
+* Update Razor to 7.0.0-preview.23455.5 (PR: [#6291](https://github.com/dotnet/vscode-csharp/pull/6291))
+  * Fixes issue reading razor.format.enable and other options (PR: [dotnet/razor#9240](https://github.com/dotnet/razor/issues/9240))
+* Fix parsing of tasks.json with comments in certain locations (PR: [#6288](https://github.com/dotnet/vscode-csharp/pull/6288))
+* Fix Razor browser discovery issues on Mac and Linux `DOTNET_ROSLYN_SERVER_PATH` environment variable (PR: [#6269](https://github.com/dotnet/vscode-csharp/pull/6269))
+
+## 2.1.2
+* Update Roslyn version (PR: [#6264](https://github.com/dotnet/vscode-csharp/pull/6264))
+  * Upgrade MSBuildLocator to fix homebrew dotnet resolution (PR: [#69769](https://github.com/dotnet/roslyn/pull/69769))
+  * Fix reported ExeName / ExeVersion (PR: [#69771](https://github.com/dotnet/roslyn/pull/69771))
+* Add 1.x setting names to migrated settings descriptions (PR: [#6266](https://github.com/dotnet/vscode-csharp/pull/6266))
+
+## 2.0.436
 * Update Roslyn version (PR: [#6245](https://github.com/dotnet/vscode-csharp/pull/6245))
   * Fix import completion (PR: [#69691](https://github.com/dotnet/roslyn/pull/69691))
   * Reduce overhead on semantic token refresh requests (PR: [#69690](https://github.com/dotnet/roslyn/pull/69690))
@@ -36,7 +138,7 @@
 * Fix issue resolving .NET 7 runtimes from path (PR: [#6175](https://github.com/dotnet/vscode-csharp/pull/6175))
 * Fix URI issue when loading Razor files (PR: [#6168](https://github.com/dotnet/vscode-csharp/pull/6168))
 * Bump Razor to 7.0.0-preview.23417.3 (PR: [#6165](https://github.com/dotnet/vscode-csharp/pull/6165))
-  * Fix various textDocument/foldingRange issues (PR: [#9134](https://github.com/dotnet/razor/pull/9134)) 
+  * Fix various textDocument/foldingRange issues (PR: [#9134](https://github.com/dotnet/razor/pull/9134))
 * Clarify dotnet path option description (PR: [#6164](https://github.com/dotnet/vscode-csharp/pull/6164))
 * Handle multiple dotnet on path and symlinks (PR: [#6152](https://github.com/dotnet/vscode-csharp/pull/6152))
 * Localize Roslyn options (PR: [#6136](https://github.com/dotnet/vscode-csharp/pull/6136))
@@ -75,7 +177,7 @@
 * Fix misleading LSP server logs (PR: [#69378](https://github.com/dotnet/roslyn/pull/69378))
 * Add support for code lens enable/disable options to roslyn LSP (PR: [#6001](https://github.com/dotnet/vscode-csharp/pull/6001))
 * Onboard Localization pipeline (PR: [#5990](https://github.com/dotnet/vscode-csharp/pull/5990))
-* Enable loading translated strings from razor TS code (PR: [#5962](https://github.com/dotnet/vscode-csharp/pull/5962))
+* Enable loading translated strings from Razor TS code (PR: [#5962](https://github.com/dotnet/vscode-csharp/pull/5962))
 * Update typescript and eslint plugin to remove build warning (PR: [6002](https://github.com/dotnet/vscode-csharp/pull/6002))
 * Report how the extension was activated (PR: [#6043](https://github.com/dotnet/vscode-csharp/pull/6043))
 * Update Razor to 7.0.0-preview.23410.1 (PR: [#6105](https://github.com/dotnet/vscode-csharp/pull/6105))
@@ -96,9 +198,9 @@ We are switching to the new Roslyn language server as the default. We recognize
 
 ## 1.26.0
 * Update OmniSharp to 1.39.7 (PR: [#5840](https://github.com/OmniSharp/omnisharp-vscode/pull/5840))
-  * Respond to breaking change in VSCode 1.79.2 in completion (PR:[#2542](https://github.com/OmniSharp/omnisharp-roslyn/pull/2542))
-  * Use dotnet-cake for build (PR:[#2537](https://github.com/OmniSharp/omnisharp-roslyn/pull/2537))
-  * Implement LSP CodeAction resolve (PR:[#2467](https://github.com/OmniSharp/omnisharp-roslyn/pull/2467))
+  * Respond to breaking change in VSCode 1.79.2 in completion (PR:[omnisharp-roslyn#2542](https://github.com/OmniSharp/omnisharp-roslyn/pull/2542))
+  * Use dotnet-cake for build (PR:[omnisharp-roslyn#2537](https://github.com/OmniSharp/omnisharp-roslyn/pull/2537))
+  * Implement LSP CodeAction resolve (PR:[omnisharp-roslyn#2467](https://github.com/OmniSharp/omnisharp-roslyn/pull/2467))
 * Update debugger to 1.25.8 (PR: [#5706](https://github.com/OmniSharp/omnisharp-vscode/pull/5706))
 * Updates to README, default branch and repo link (PR: [#5709](https://github.com/OmniSharp/omnisharp-vscode/pull/5709))
 
@@ -125,25 +227,26 @@ We are switching to the new Roslyn language server as the default. We recognize
   * Add C#/HTML folding range support ([razor#8309](https://github.com/dotnet/razor/pull/8309))
   * Formatting fixes ([razor#8318](https://github.com/dotnet/razor/pull/8318))
 * Update OmniSharp to 1.39.6 (PR: [#5625](https://github.com/OmniSharp/omnisharp-vscode/pull/5625))
-  * Use new VS threading version to match with Razor (PR:[#2518](https://github.com/OmniSharp/omnisharp-roslyn/pull/2518))
+  * Use new VS threading version to match with Razor (PR:[omnisharp-roslyn#2518](https://github.com/OmniSharp/omnisharp-roslyn/pull/2518))
 * Update OmniSharp to 1.39.5 (PR: [#5618](https://github.com/OmniSharp/omnisharp-vscode/pull/5618))
-  * Update to Roslyn `4.6.0-3.23153.5` (PR:[#2511](https://github.com/OmniSharp/omnisharp-roslyn/pull/2511))
-  * Report to the client if the project being loaded is sdk style (PR:[#2502](https://github.com/OmniSharp/omnisharp-roslyn/pull/2502))
+  * Update to Roslyn `4.6.0-3.23153.5` (PR:[omnisharp-roslyn#2511](https://github.com/OmniSharp/omnisharp-roslyn/pull/2511))
+  * Report to the client if the project being loaded is sdk style (PR:[omnisharp-roslyn#2502](https://github.com/OmniSharp/omnisharp-roslyn/pull/2502))
 * Automatically trust ASP.NET Core HTTPS development certificate (PR: [#5589](https://github.com/OmniSharp/omnisharp-vscode/pull/5589))
 * Improve outline to be less verbose (PR: [#5536](https://github.com/OmniSharp/omnisharp-vscode/pull/5536))
 * Update Razor TextMate grammar (PR: [#5570](https://github.com/OmniSharp/omnisharp-vscode/pull/5570))
 
 ## 1.25.4
 * Update OmniSharp to 1.39.4 (PR: [#5544](https://github.com/OmniSharp/omnisharp-vscode/pull/5544))
-  * Disable snippets in sync completion (PR: [#2497](https://github.com/OmniSharp/omnisharp-roslyn/pull/2497))
+  * Disable snippets in sync completion (PR: [omnisharp-roslyn#2497](https://github.com/OmniSharp/omnisharp-roslyn/pull/2497))
 
 ## 1.25.3
 * Update Razor to 7.0.0-preview.23067.5 (PR: [#5543](https://github.com/OmniSharp/omnisharp-vscode/pull/5543))
   * Enables support for arm64
   * Adds document color and color presentation features
-* Update Roslyn to 4.5.0-2.22527.10 (PR: [#2486](https://github.com/OmniSharp/omnisharp-roslyn/pull/2486))
-* Update dotnet-script dependencies to 1.4.0 (PR: [#2477](https://github.com/OmniSharp/omnisharp-roslyn/pull/2477))
-* Register the LanguageServerLogger only once (PR: [#2473](https://github.com/OmniSharp/omnisharp-roslyn/pull/2473))
+* Update OmniSharp to 1.39.3 (PR: [#5520](https://github.com/OmniSharp/omnisharp-vscode/pull/5520))
+  * Update Roslyn to 4.5.0-2.22527.10 (PR: [omnisharp-roslyn#2486](https://github.com/OmniSharp/omnisharp-roslyn/pull/2486))
+  * Update dotnet-script dependencies to 1.4.0 (PR: [omnisharp-roslyn#2477](https://github.com/OmniSharp/omnisharp-roslyn/pull/2477))
+  * Register the LanguageServerLogger only once (PR: [omnisharp-roslyn#2473](https://github.com/OmniSharp/omnisharp-roslyn/pull/2473))
 * Fix extension not finding mono. ([#5454](https://github.com/OmniSharp/omnisharp-vscode/issues/5454), PR: [#5484](https://github.com/OmniSharp/omnisharp-vscode/pull/5484))
 * Update debugger to 1.25.3. ([#5460](https://github.com/OmniSharp/omnisharp-vscode/issues/5460), PR: [#5489](https://github.com/OmniSharp/omnisharp-vscode/pull/5489))
 * Fix missing fix all commands. ([#5474](https://github.com/OmniSharp/omnisharp-vscode/issues/5474), PR: [#5475](https://github.com/OmniSharp/omnisharp-vscode/pull/5475))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 304d70dcc..a17f2a452 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,7 +49,7 @@ VSIXs can be created using the gulp command `gulp vsix:release:package`.  This w
 
 To update the version of the roslyn server used by the extension do the following:
 1.  Find the the Roslyn signed build you want from [here](https://dnceng.visualstudio.com/internal/_build?definitionId=327&_a=summary).  Typically the latest successful build of main is fine.
-2.  In the official build stage, look for the `Publish Assets` step.  In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.
+2.  In the official build stage, look for the `Publish Assets` step.  In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer.neutral` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.
 3.  In the [package.json](package.json) inside the `defaults` section update the `roslyn` key to point to the version number you found above in step 2.
-4.  Build and test the change (make sure to run `gulp installDependencies` to get the new version!).  If everything looks good, submit a PR.
-    * Adding new package versions might require authentication, run with the `--interactive` flag to login.  You may need to install [azure artifacts nuget credential provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication.
+4.  Ensure that version of the package is in the proper feeds by running `gulp updateRoslynVersion`. Note: you may need to install the [Azure Artifacts NuGet Credential Provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication.
+5.  Build and test the change. If everything looks good, submit a PR.
\ No newline at end of file
diff --git a/SUPPORT.md b/SUPPORT.md
new file mode 100644
index 000000000..c13db59d4
--- /dev/null
+++ b/SUPPORT.md
@@ -0,0 +1,11 @@
+# Support
+
+## How to file issues and get help
+
+This project uses GitHub Issues to track bugs and feature requests. Please search the [existing issues](https://github.com/dotnet/vscode-csharp/issues) before filing new issues to avoid duplicates. For new issues, file your bug or feature request as a new Issue.
+
+For help and questions about using this project, please see the [README](https://github.com/dotnet/vscode-csharp/blob/main/README.md).
+
+## Microsoft Support Policy
+
+Support for this project is limited to the resources listed above.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 098024988..0eef386d9 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -5,23 +5,16 @@ trigger:
     - release
 pr: none
 
-variables:
-  ${{ if eq(variables['Build.SourceBranchName'], 'release') }}:
-    prereleaseFlag: ''
-  ${{ else }}:
-    prereleaseFlag: '--prerelease'
+parameters:
+  # Allows the version number to be set manually for a specific build.
+  # Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release).
+  - name: versionNumberOverride
+    type: string
+    default: 'default'
 
 stages:
-- stage: Build
-  dependsOn: []
-  jobs:
-  - job: Build
-    steps:
-    - template: azure-pipelines/build.yml
-      parameters:
-        prereleaseFlag: $(prereleaseFlag)
-    pool:
-      name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
+- template: azure-pipelines/build.yml
+  parameters:
+    versionNumberOverride: ${{ parameters.versionNumberOverride }}
 
 # TODO: add compliance, signing.
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0203dcc54..7dc26e45c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,53 +11,44 @@ pr:
 - release
 - main
 
-variables:
-  ${{ if eq(variables['Build.SourceBranchName'], 'release') }}:
-    prereleaseFlag: ''
-  ${{ else }}:
-    prereleaseFlag: '--prerelease'
-
 stages:
-- stage: Build
-  dependsOn: []
-  jobs:
-  - job: Build
-    steps:
-    - template: azure-pipelines/build.yml
-      parameters:
-        prereleaseFlag: $(prereleaseFlag)
-    pool:
-      name: NetCore-Public
-      demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+- template: azure-pipelines/build.yml
 
 - stage: Test
   displayName: Test
   dependsOn: []
   jobs:
-  - job: Test
-    strategy:
-      matrix:
-        linux:
-          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
-        windows:
-          demandsName: ImageOverride -equals 1es-windows-2022-open
-    pool:
-      name: NetCore-Public
-      demands: $(demandsName)
-    steps:
-    - template: azure-pipelines/test.yml
+  - template: azure-pipelines/test.yml
+    parameters:
+      jobName: Linux
+      poolName: NetCore-Public
+      demandsName: 1es-ubuntu-2004-open
+
+  - template: azure-pipelines/test.yml
+    parameters:
+      jobName: Windows
+      poolName: NetCore-Public
+      demandsName: 1es-windows-2022-open
 
-- stage: Test_Omnisharp
-  displayName: Test Omnisharp
+  - template: azure-pipelines/test.yml
+    parameters:
+      jobName: MacOS
+      poolName: Azure Pipelines
+      vmImageName: macOS-13
+
+- stage: Test_OmniSharp
+  displayName: Test OmniSharp
   dependsOn: []
   jobs:
   - job: Test
     strategy:
       matrix:
         linux:
-          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+          demandsName: 1es-ubuntu-2004-open
+        windows:
+          demandsName: 1es-windows-2022-open
     pool:
       name: NetCore-Public
-      demands: $(demandsName)
+      demands: ImageOverride -equals $(demandsName)
     steps:
     - template: azure-pipelines/test-omnisharp.yml
diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
index fb54c630e..729f163c8 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -1,26 +1,63 @@
 parameters:
-- name: prereleaseFlag
+- name: versionNumberOverride
   type: string
+  default: 'default'
 
-steps:
-- checkout: self
-  clean: true
-  submodules: true
-  fetchTags: false
-  fetchDepth: 0
+stages:
+- stage: Build
+  displayName: 'Build VSIXs'
+  jobs:
+  - job:
+    displayName: 'Build Prerelease VSIXs'
+    steps:
+    - checkout: self
+      clean: true
+      submodules: true
+      fetchTags: false
+      fetchDepth: 0
 
-- template: prereqs.yml
+    - template: prereqs.yml
+      parameters:
+        versionNumberOverride: ${{ parameters.versionNumberOverride }}
 
-- script: gulp 'vsix:release:package' ${{ parameters.prereleaseFlag }}
-  displayName: 'Build VSIXs'
+    - script: gulp 'vsix:release:package' --prerelease
+      displayName: 'Build VSIXs'
+
+    - task: PublishPipelineArtifact@1
+      # Run the publish step so we have vsix's even if the tests fail.
+      condition: succeededOrFailed()
+      displayName: 'Publish VSIXs'
+      inputs:
+        targetPath: '$(Build.SourcesDirectory)/vsix'
+        artifactName: 'VSIX_Prerelease_$(System.JobAttempt)'
+
+    - script: npm run omnisharptest:artifacts
+      displayName: 'Run artifacts tests'
+
+  - job:
+    displayName: 'Build Release VSIXs'
+    steps:
+    - checkout: self
+      clean: true
+      submodules: true
+      fetchTags: false
+      fetchDepth: 0
+
+    - template: prereqs.yml
+      parameters:
+        versionNumberOverride: ${{ parameters.versionNumberOverride }}
+
+    - script: gulp 'vsix:release:package'
+      displayName: 'Build VSIXs'
 
-- task: PublishPipelineArtifact@1
-  # Run the publish step so we have vsix's even if the tests fail.
-  condition: succeededOrFailed()
-  displayName: 'Publish VSIXs'
-  inputs:
-    targetPath: '$(Build.SourcesDirectory)/vsix'
-    artifactName: 'VSIXs - Attempt $(System.JobAttempt)'
+    - task: PublishPipelineArtifact@1
+      # Run the publish step so we have vsix's even if the tests fail.
+      condition: succeededOrFailed()
+      displayName: 'Publish VSIXs'
+      inputs:
+        targetPath: '$(Build.SourcesDirectory)/vsix'
+        artifactName: 'VSIX_Release_$(System.JobAttempt)'
 
-- script: npm run omnisharptest:artifacts
-  displayName: 'Run artifacts tests'
+    - script: npm run omnisharptest:artifacts
+      displayName: 'Run artifacts tests'
+  
\ No newline at end of file
diff --git a/azure-pipelines/prereqs.yml b/azure-pipelines/prereqs.yml
index 23160601b..8531d9341 100644
--- a/azure-pipelines/prereqs.yml
+++ b/azure-pipelines/prereqs.yml
@@ -1,3 +1,8 @@
+parameters:
+  - name: versionNumberOverride
+    type: string
+    default: 'default'
+
 steps:
 
 # The server package is downloaded from NuGet
@@ -13,12 +18,20 @@ steps:
   inputs:
     version: '7.x'
 
-# Set the CI build number to the VSIX version we're creating from this build.
 - script: |
     dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv
-    $(Agent.BuildDirectory)/nbgv cloud
   displayName: Install nbgv
 
+# If we want to override the version, update the version.json here - vsix packaging will see this value
+# and use it to set the version number in the package.json.
+- ${{ if ne(parameters.versionNumberOverride, 'default') }}:
+  - script: $(Agent.BuildDirectory)/nbgv set-version ${{ parameters.versionNumberOverride }}
+    displayName: 'Override version number'
+
+# Set the CI build number to the VSIX version we're creating from this build.
+- script: $(Agent.BuildDirectory)/nbgv cloud
+  displayName: Set pipeline build number
+
 - script: |
     npm ci
     npm i -g gulp
@@ -26,6 +39,3 @@ steps:
 
 - script: npm run compile
   displayName: 'Compile'
-
-- script: npm run vscode:prepublish
-  displayName: 'Prepublish VSIXs'
diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
index ee2c8561d..dc040c813 100644
--- a/azure-pipelines/release.yml
+++ b/azure-pipelines/release.yml
@@ -11,6 +11,9 @@ parameters:
   - name: test
     type: boolean
     default: true
+  - name: uploadPrerelease
+    type: boolean
+    default: true
 
 variables:
 # This is expected to provide VisualStudioMarketplacePAT to the release (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token)
@@ -44,8 +47,15 @@ stages:
               npm install --global vsce
             displayName: 'Install vsce'
           - pwsh: |
+              $artifactFolderPrefix = "VSIX_Release_"
+              if ("${{ parameters.uploadPrerelease }}" -eq "true") {
+                $artifactFolderPrefix = "VSIX_Prerelease_"
+              }
+
+              Write-Host "Using artifacts from $artifactFolderPrefix"
+
               # Our build pipeline would generated build based on attempt number. Publishing the latest attempt.
-              $allArtifacts = Get-ChildItem -Path "VSIXs - Attempt*" | Sort-Object -Descending
+              $allArtifacts = Get-ChildItem -Path "$artifactFolderPrefix*" | Sort-Object -Descending
               if ($allArtifacts.Length -eq 0) {
                 throw "No Artifacts is downloaded."
               }
@@ -54,14 +64,11 @@ stages:
               Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)."
 
               $basePublishArgs = , "publish"
-              # Artifacts are published to either pre-release or release based on the build branch, https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
-              If ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/main") {
+              If ("${{ parameters.uploadPrerelease }}" -eq "true") {
                 $basePublishArgs += "--pre-release"
                 Write-Host "Publish to pre-release channel."
-              } ElseIf ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/release") {
-                Write-Host "Publish to release channel."
               } Else {
-                throw "Unexpected branch name: $(resources.pipeline.officialBuildCI.sourceBranch)."
+                Write-Host "Publish to release channel."
               }
               $basePublishArgs += '--packagePath'
 
@@ -92,7 +99,7 @@ stages:
 - stage: 'TagRelease'
   displayName: 'Tag release of vscode-csharp'
   dependsOn: 'PublishStage'
-  condition: and(succeeded('PublishStage'), eq(variables['resources.pipeline.officialBuildCI.sourceBranch'], 'refs/heads/release'))
+  condition: succeeded('PublishStage')
   jobs:
   - job: 'Tag'
     pool:
@@ -109,7 +116,7 @@ stages:
       fetchDepth: 0
     - pwsh: |
         git checkout $(resources.pipeline.officialBuildCI.sourceCommit)
-      displayName: 'Checkout to release branch'
+      displayName: 'Checkout build source branch'
     - pwsh: |
         npm ci
         npm install
diff --git a/azure-pipelines/test-omnisharp.yml b/azure-pipelines/test-omnisharp.yml
index a651a698a..fefcc52e4 100644
--- a/azure-pipelines/test-omnisharp.yml
+++ b/azure-pipelines/test-omnisharp.yml
@@ -7,20 +7,16 @@ steps:
 
 - template: prereqs.yml
 
-- pwsh: |
-    if ($IsLinux) {
-      Write-Host "Activating screen emulation"
-      /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      $env:DISPLAY=':99.0'
-      Write-Host "Now running tests"
-    }
+- template: test-prereqs.yml
 
-    npm run omnisharptest
+- script: npm run omnisharptest
   displayName: 🧪 Run unit and integration tests
+  env:
+    DISPLAY: :99.0
 
 - task: PublishPipelineArtifact@1
   condition: failed()
   displayName: 'Upload integration test logs'
   inputs:
     targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
-    artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'
+    artifactName: 'VSCode Test OmniSharp Logs ($(Agent.JobName)-$(System.JobAttempt))'
diff --git a/azure-pipelines/test-prereqs.yml b/azure-pipelines/test-prereqs.yml
new file mode 100644
index 000000000..c86649a34
--- /dev/null
+++ b/azure-pipelines/test-prereqs.yml
@@ -0,0 +1,12 @@
+steps:
+
+- script: npm run vscode:prepublish
+  displayName: 'Prepublish VSIXs'
+
+# We need to download the roslyn language server for the current platform to run integration tests against it.
+- script: gulp installDependencies
+  displayName: 'Install Roslyn Language Server'
+
+- script: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  displayName: 'Activate screen emulation'
+  condition: eq(variables['Agent.OS'], 'Linux')
diff --git a/azure-pipelines/test.yml b/azure-pipelines/test.yml
index 90d9c6e36..22b589d2a 100644
--- a/azure-pipelines/test.yml
+++ b/azure-pipelines/test.yml
@@ -1,26 +1,44 @@
-steps:
-- checkout: self
-  clean: true
-  submodules: true
-  fetchTags: false
-  fetchDepth: 1
+parameters:
+  - name: jobName
+    type: string
+  - name: poolName
+    type: string
+  - name: demandsName
+    type: string
+    default: ''
+  - name: vmImageName
+    type: string
+    default: ''
 
-- template: prereqs.yml
+jobs:
+- job: Test_${{ parameters.jobName }}
+  displayName: 'Test ${{ parameters.jobName }}'
+  pool:
+    ${{ if ne(parameters.poolName, '') }}:
+      name: ${{ parameters.poolName }}
+    ${{ if ne(parameters.demandsName, '') }}:
+      demands: ImageOverride -equals ${{ parameters.demandsName }}
+    ${{ if ne(parameters.vmImageName, '') }}:
+      vmImage: ${{ parameters.vmImageName }}
+  steps:
+  - checkout: self
+    clean: true
+    submodules: true
+    fetchTags: false
+    fetchDepth: 1
 
-- pwsh: |
-    if ($IsLinux) {
-      Write-Host "Activating screen emulation"
-      /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      $env:DISPLAY=':99.0'
-      Write-Host "Now running tests"
-    }
+  - template: prereqs.yml
 
-    npm run test
-  displayName: 🧪 Run unit and integration tests
+  - template: test-prereqs.yml
 
-- task: PublishPipelineArtifact@1
-  condition: failed()
-  displayName: 'Upload integration test logs'
-  inputs:
-    targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
-    artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'
+  - script: npm run test
+    displayName: 🧪 Run unit and integration tests
+    env:
+      DISPLAY: :99.0
+
+  - task: PublishPipelineArtifact@1
+    condition: failed()
+    displayName: 'Upload integration test logs'
+    inputs:
+      targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
+      artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'
diff --git a/baseJestConfig.ts b/baseJestConfig.ts
new file mode 100644
index 000000000..5b7935c76
--- /dev/null
+++ b/baseJestConfig.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+
+/**
+ * Defines a base project config that we can re-use across the project specific jest configs.
+ * We do this because jest generally does not inherit project configuration settings.
+ */
+export const baseProjectConfig: Config = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    transformIgnorePatterns: ['/dist/.+\\.js'],
+};
diff --git a/gulpfile.ts b/gulpfile.ts
index 391bbb80f..fde148e02 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -3,25 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as gulp from 'gulp';
-import * as optionsSchemaGenerator from './src/tools/generateOptionsSchema';
-import * as packageDependencyUpdater from './src/tools/updatePackageDependencies';
-
 require('./tasks/testTasks');
 require('./tasks/offlinePackagingTasks');
 require('./tasks/backcompatTasks');
 require('./tasks/localizationTasks');
 require('./tasks/createTagsTasks');
-
-// Disable warning about wanting an async function
-// tslint:disable-next-line
-gulp.task('generateOptionsSchema', async (): Promise<void> => {
-    optionsSchemaGenerator.GenerateOptionsSchema();
-    return Promise.resolve();
-});
-
-// Disable warning about wanting an async function
-// tslint:disable-next-line
-gulp.task('updatePackageDependencies', async (): Promise<void> => {
-    return packageDependencyUpdater.updatePackageDependencies();
-});
+require('./tasks/debuggerTasks');
diff --git a/jest.config.ts b/jest.config.ts
index 73632cb3e..38657fb42 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -5,17 +5,13 @@
 import type { Config } from 'jest';
 
 const config: Config = {
-    verbose: true,
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-    transformIgnorePatterns: ['/dist/.+\\.js'],
-    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
-    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
-    modulePathIgnorePatterns: ['out'],
-    // Specify jest to only run tests in jest folders.
-    // We also have to include the __mocks__ folder.  That folder must be next to node_modules so we can't move it,
-    // but if we specify roots, jest won't automatically pick it up.  So we have to specify it here.
-    roots: ['<rootDir>/test/unitTests', '<rootDir>/omnisharptest/omnisharpJestTests', '<rootDir>/__mocks__'],
+    projects: [
+        '<rootDir>/test/unitTests/jest.config.ts',
+        '<rootDir>/test/integrationTests/jest.config.ts',
+        '<rootDir>/test/razorIntegrationTests/jest.config.ts',
+        '<rootDir>/test/razorTests/jest.config.ts',
+        '<rootDir>/omnisharptest/omnisharpUnitTests/jest.config.ts',
+    ],
 };
 
 export default config;
diff --git a/l10n/bundle.l10n.cs.json b/l10n/bundle.l10n.cs.json
index 30113e31f..5ea209374 100644
--- a/l10n/bundle.l10n.cs.json
+++ b/l10n/bundle.l10n.cs.json
@@ -42,10 +42,11 @@
   "Extension": "Rozšíření",
   "Extensions": "Rozšíření",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Nepovedlo se dokončit instalaci rozšíření C#. Podívejte se na chybu v okně výstupu níže.",
-  "Failed to parse tasks.json file": "Nepovedlo se parsovat soubor tasks.json.",
+  "Failed to parse tasks.json file: {0}": "Nepovedlo se parsovat soubor tasks.json: {0}",
   "Failed to set debugadpter directory": "Nepovedlo se nastavit adresář debugadpter.",
   "Failed to set extension directory": "Nepovedlo se nastavit adresář rozšíření.",
   "Failed to set install complete file path": "Nepovedlo se nastavit úplnou cestu k souboru instalace",
+  "Fix All Code Action": "Opravit všechny akce kódu",
   "For further information visit {0}": "Další informace najdete na {0}",
   "For further information visit {0}.": "Další informace najdete na {0}.",
   "For more information about the 'console' field, see {0}": "Další informace o poli „console“ najdete v tématu {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Otevřít soubor envFile",
   "Operating system \"{0}\" not supported.": "Operační systém {0} se nepodporuje.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Proveďte činnost (nebo zopakujte nečinnost), která vedla k problémům s Razorem.",
+  "Pick a fix all scope": "Výběr opravy všech oborů",
   "Pipe transport failed to get OS and processes.": "Operaci přenosu přes kanál se nepovedlo získat operační systém a procesy.",
   "Please fill in this section": "Vyplňte prosím tento oddíl.",
   "Press {0}": "Stiskněte {0}.",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "V „{0}“ chybí požadované prostředky pro sestavení a ladění. Chcete je přidat?",
   "Restart": "Restartovat",
   "Restart Language Server": "Restartovat jazykový server",
-  "Run and Debug: A valid browser is not installed": "Spustit a ladit: Není nainstalovaný platný prohlížeč.",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Spustit a ladit: Není nainstalovaný platný prohlížeč. Nainstalujte si prosím Edge nebo Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Spustit a ladit: Automatická detekce našla {0} pro spouštěný prohlížeč.",
   "See {0} output": "Zobrazit výstup {0}",
   "Select the process to attach to": "Vyberte proces, ke kterému se má program připojit.",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[CHYBA]: Rozšíření jazyka C# se nepodařilo nainstalovat balíček ladicího programu.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Možnost dotnet.server.useOmharharp se změnila. Pokud chcete změnu použít, načtěte prosím znovu okno.",
   "pipeArgs must be a string or a string array type": "pipeArgs musí být řetězec nebo typ pole řetězců",
+  "{0} Keyword": "Klíčové slovo {0}",
   "{0} references": "Počet odkazů: {0}",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, vložte obsah problému jako text problému. Nezapomeňte vyplnit všechny podrobnosti, které ještě vyplněné nejsou."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.de.json b/l10n/bundle.l10n.de.json
index 6eb0cc120..9d8de36f0 100644
--- a/l10n/bundle.l10n.de.json
+++ b/l10n/bundle.l10n.de.json
@@ -42,10 +42,11 @@
   "Extension": "Erweiterung",
   "Extensions": "Erweiterungen",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Fehler beim Abschließen der Installation der C#-Erweiterung. Den Fehler finden Sie unten im Ausgabefenster.",
-  "Failed to parse tasks.json file": "Fehler beim Analysieren der Datei \"tasks.json\".",
+  "Failed to parse tasks.json file: {0}": "Fehler beim Analysieren der Datei \"tasks.json\": {0}",
   "Failed to set debugadpter directory": "Fehler beim Festlegen des Debugadapterverzeichnisses",
   "Failed to set extension directory": "Fehler beim Festlegen des Erweiterungsverzeichnisses",
   "Failed to set install complete file path": "Fehler beim Festlegen des Vollständigen Installationsdateipfads.",
+  "Fix All Code Action": "Korrigieren der gesamten Codeaktion",
   "For further information visit {0}": "Weitere Informationen finden Sie unter {0}",
   "For further information visit {0}.": "Weitere Informationen finden Sie unter {0}.",
   "For more information about the 'console' field, see {0}": "Weitere Informationen zum Feld \"Konsole\" finden Sie unter {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "envFile öffnen",
   "Operating system \"{0}\" not supported.": "Das Betriebssystem \"{0}\" wird nicht unterstützt.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Führen Sie die Aktionen (oder keine Aktion) aus, die zu Ihrem Razor-Problem geführt haben.",
+  "Pick a fix all scope": "Wählen Sie eine Korrektur für den gesamten Bereich aus",
   "Pipe transport failed to get OS and processes.": "Der Pipetransport konnte das Betriebssystem und die Prozesse nicht abrufen.",
   "Please fill in this section": "Füllen Sie diesen Abschnitt aus.",
   "Press {0}": "Drücken Sie {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Erforderliche Ressourcen zum Erstellen und Debuggen fehlen in \"{0}\". Sie hinzufügen?",
   "Restart": "Neu starten",
   "Restart Language Server": "Sprachserver neu starten",
-  "Run and Debug: A valid browser is not installed": "Ausführen und Debuggen: Es ist kein gültiger Browser installiert.",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Ausführen und Debuggen: Es ist kein gültiger Browser installiert. Installieren Sie Edge oder Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Ausführen und Debuggen: Die automatische Erkennung hat {0} für einen Startbrowser gefunden.",
   "See {0} output": "{0}-Ausgabe anzeigen",
   "Select the process to attach to": "Prozess auswählen, an den angefügt werden soll",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[FEHLER]: Fehler beim Installieren des Debuggerpakets durch die C#-Erweiterung.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Die Option \"dotnet.server.useOmnisharp\" wurde geändert. Laden Sie das Fenster neu, um die Änderung anzuwenden.",
   "pipeArgs must be a string or a string array type": "pipeArgs muss eine Zeichenfolge oder ein Zeichenfolgenarraytyp sein.",
+  "{0} Keyword": "{0}-Schlüsselwort",
   "{0} references": "{0} Verweise",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, fügen Sie den Inhalt des Problems als Textkörper des Problems ein. Vergessen Sie nicht, alle nicht ausgefüllten Details auszufüllen."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.es.json b/l10n/bundle.l10n.es.json
index 212be3951..b3886eb73 100644
--- a/l10n/bundle.l10n.es.json
+++ b/l10n/bundle.l10n.es.json
@@ -42,10 +42,11 @@
   "Extension": "Extension",
   "Extensions": "Extensiones",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "No se pudo completar la instalación de la extensión de C#. Vea el error en la ventana de salida siguiente.",
-  "Failed to parse tasks.json file": "No se pudo analizar el archivo tasks.json",
+  "Failed to parse tasks.json file: {0}": "No se pudo analizar el archivo tasks.json: {0}",
   "Failed to set debugadpter directory": "No se pudo establecer el directorio debugadpter",
   "Failed to set extension directory": "No se pudo establecer el directorio de la extensión",
   "Failed to set install complete file path": "No se pudo establecer la ruta de acceso completa del archivo de instalación",
+  "Fix All Code Action": "Corregir toda la acción de código",
   "For further information visit {0}": "Para obtener más información, visite {0}",
   "For further information visit {0}.": "Para obtener más información, visite {0}.",
   "For more information about the 'console' field, see {0}": "Para obtener más información sobre el campo \"consola\", consulte {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Abrir envFile",
   "Operating system \"{0}\" not supported.": "No se admite el sistema operativo \"{0}\".",
   "Perform the actions (or no action) that resulted in your Razor issue": "Realizar las acciones (o ninguna acción) que provocaron el problema de Razor",
+  "Pick a fix all scope": "Seleccionar una corrección de todo el ámbito",
   "Pipe transport failed to get OS and processes.": "El transporte de canalización no pudo obtener el sistema operativo y los procesos.",
   "Please fill in this section": "Rellene esta sección",
   "Press {0}": "Presionar {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Faltan los recursos en '{0}' necesarios para compilar y depurar. ¿Quiere agregarlos?",
   "Restart": "Reiniciar",
   "Restart Language Server": "Reiniciar servidor de lenguaje",
-  "Run and Debug: A valid browser is not installed": "Ejecutar y depurar: no hay instalado un explorador válido",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Ejecutar y depurar: no hay instalado un explorador válido. Instale Edge o Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Ejecución y depuración: detección automática encontrada {0} para un explorador de inicio",
   "See {0} output": "Ver salida {0}",
   "Select the process to attach to": "Seleccione el proceso al que debe asociarse",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: la extensión de C# no pudo instalar el paquete del depurador.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "La opción dotnet.server.useOmnrp ha cambiado. Vuelva a cargar la ventana para aplicar el cambio.",
   "pipeArgs must be a string or a string array type": "pipeArgs debe ser una cadena o un tipo de matriz de cadena",
+  "{0} Keyword": "{0} Palabra clave",
   "{0} references": "{0} referencias",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, pegue el contenido del problema como el cuerpo del problema. No olvide rellenar los detalles que no se han rellenado."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.fr.json b/l10n/bundle.l10n.fr.json
index a911b9ef7..85079328d 100644
--- a/l10n/bundle.l10n.fr.json
+++ b/l10n/bundle.l10n.fr.json
@@ -42,10 +42,11 @@
   "Extension": "Extension",
   "Extensions": "Extensions",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Échec de l’installation de l’extension C#. Consultez l’erreur dans la fenêtre sortie ci-dessous.",
-  "Failed to parse tasks.json file": "Échec de l’analyse du fichier tasks.json",
+  "Failed to parse tasks.json file: {0}": "Échec de l'analyse du fichier Tasks.json : {0}",
   "Failed to set debugadpter directory": "Échec de la définition du répertoire debugadpter",
   "Failed to set extension directory": "Échec de la définition du répertoire d’extensions",
   "Failed to set install complete file path": "Échec de la définition du chemin d’accès complet à l’installation",
+  "Fix All Code Action": "Corriger toutes les actions de code",
   "For further information visit {0}": "Pour plus d’informations, consultez {0}",
   "For further information visit {0}.": "Pour plus d’informations, consultez {0}.",
   "For more information about the 'console' field, see {0}": "Pour plus d’informations sur le champ « console », consultez {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Ouvrir envFile",
   "Operating system \"{0}\" not supported.": "Système d'exploitation \"{0}\" non pris en charge.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Effectuez les actions (ou aucune action) ayant entraîné votre problème Razor",
+  "Pick a fix all scope": "Choisir un correctif pour toutes les étendues",
   "Pipe transport failed to get OS and processes.": "Le transport de canal n'a pas pu obtenir le système d'exploitation et les processus.",
   "Please fill in this section": "Veuillez remplir cette section",
   "Press {0}": "Appuyez sur {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Les ressources requises pour la génération et le débogage sont manquantes dans « {0} ». Les ajouter ?",
   "Restart": "Redémarrer",
   "Restart Language Server": "Redémarrer le serveur de langue",
-  "Run and Debug: A valid browser is not installed": "Exécuter et déboguer : aucun navigateur valide n’est installé",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Exécuter et déboguer : aucun navigateur valide n’est installé. Installez Edge ou Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Exécuter et déboguer : détection automatique détectée {0} pour un navigateur de lancement",
   "See {0} output": "Voir la sortie {0}",
   "Select the process to attach to": "Sélectionner le processus à attacher",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERREUR] : l’extension C# n’a pas pu installer le package du débogueur.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "l’option dotnet.server.useOmnzurp a changé. Rechargez la fenêtre pour appliquer la modification",
   "pipeArgs must be a string or a string array type": "pipeArgs doit être une chaîne ou un type de tableau de chaînes",
+  "{0} Keyword": "Mot clé {0}",
   "{0} references": "{0} références",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, collez le contenu de votre problème en tant que corps du problème. N’oubliez pas de remplir tous les détails qui n’ont pas été remplis."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.it.json b/l10n/bundle.l10n.it.json
index 8213ff96b..4ae100836 100644
--- a/l10n/bundle.l10n.it.json
+++ b/l10n/bundle.l10n.it.json
@@ -42,10 +42,11 @@
   "Extension": "Estensione",
   "Extensions": "Estensioni",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Non è stato possibile completare l'installazione dell'estensione C#. Vedere l'errore nella finestra di output seguente.",
-  "Failed to parse tasks.json file": "Non è stato possibile analizzare il file tasks.json",
+  "Failed to parse tasks.json file: {0}": "Non è stato possibile analizzare il file tasks.json: {0}",
   "Failed to set debugadpter directory": "Non è stato possibile impostare la directory dell'elenco di debug",
   "Failed to set extension directory": "Non è stato possibile impostare la directory delle estensioni",
   "Failed to set install complete file path": "Non è stato possibile impostare il percorso completo del file di installazione",
+  "Fix All Code Action": "Correzione di tutte le azioni del codice",
   "For further information visit {0}": "Per ulteriori informazioni, visitare {0}",
   "For further information visit {0}.": "Per ulteriori informazioni, visitare {0}.",
   "For more information about the 'console' field, see {0}": "Per ulteriori informazioni sul campo 'console', vedere {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Apri envFile",
   "Operating system \"{0}\" not supported.": "Il sistema operativo \"{0}\" non è supportato.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Eseguire le azioni (o nessuna azione) che hanno generato il problema Razor",
+  "Pick a fix all scope": "Seleziona una correzione per tutti gli ambiti",
   "Pipe transport failed to get OS and processes.": "Il trasporto pipe non è riuscito a ottenere il sistema operativo e i processi.",
   "Please fill in this section": "Compila questa sezione",
   "Press {0}": "Premere {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Le risorse necessarie per la compilazione e il debug non sono presenti in '{0}'. Aggiungerli?",
   "Restart": "Riavvia",
   "Restart Language Server": "Riavviare il server di linguaggio",
-  "Run and Debug: A valid browser is not installed": "Esecuzione e debug: non è installato un browser valido",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Esecuzione e debug: non è installato un browser valido. Installa Edge o Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Esecuzione e debug: il rilevamento automatico ha trovato {0} per un browser di avvio",
   "See {0} output": "Vedi output {0}",
   "Select the process to attach to": "Selezionare il processo a cui collegarsi",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: l'estensione C# non è riuscita a installare il pacchetto del debugger.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "L'opzione dotnet.server.useOmnisharp è stata modificata. Ricaricare la finestra per applicare la modifica",
   "pipeArgs must be a string or a string array type": "pipeArgs deve essere un tipo stringa o matrice di stringhe",
+  "{0} Keyword": "Parola chiave di {0}",
   "{0} references": "{0} riferimenti",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, incollare il contenuto del problema come corpo del problema. Non dimenticare di compilare i dettagli rimasti che non sono stati compilati."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.ja.json b/l10n/bundle.l10n.ja.json
index c77edd9c0..7fb9bd5fb 100644
--- a/l10n/bundle.l10n.ja.json
+++ b/l10n/bundle.l10n.ja.json
@@ -42,10 +42,11 @@
   "Extension": "拡張機能",
   "Extensions": "拡張機能",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "C# 拡張機能のインストールを完了できませんでした。以下の出力ウィンドウでエラーを確認してください。",
-  "Failed to parse tasks.json file": "tasks.json ファイルを解析できませんでした",
+  "Failed to parse tasks.json file: {0}": "tasks.json ファイルを解析できませんでした: {0}",
   "Failed to set debugadpter directory": "debugadpter ディレクトリを設定できませんでした",
   "Failed to set extension directory": "拡張機能ディレクトリを設定できませんでした",
   "Failed to set install complete file path": "インストール完了ファイル パスを設定できませんでした",
+  "Fix All Code Action": "すべてのコードアクションを修正する",
   "For further information visit {0}": "詳細については、{0} を参照してください",
   "For further information visit {0}.": "詳細については、{0} を参照してください。",
   "For more information about the 'console' field, see {0}": "'console' フィールドの詳細については、{0} を参照してください",
@@ -72,6 +73,7 @@
   "Open envFile": "envFile を開く",
   "Operating system \"{0}\" not supported.": "オペレーティング システム \"{0}\" はサポートされていません。",
   "Perform the actions (or no action) that resulted in your Razor issue": "Razor の問題の原因となったアクションを実行します (またはアクションを実行しません)",
+  "Pick a fix all scope": "すべてのスコープの修正を選択する",
   "Pipe transport failed to get OS and processes.": "パイプ トランスポートで OS とプロセスを取得できませんでした。",
   "Please fill in this section": "このセクションに入力してください",
   "Press {0}": "{0} を押す",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "ビルドおよびデバッグに必要な資産が '{0}' にありません。追加しますか?",
   "Restart": "再起動",
   "Restart Language Server": "言語サーバーの再起動",
-  "Run and Debug: A valid browser is not installed": "実行とデバッグ: 有効なブラウザーがインストールされていません",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "実行とデバッグ: 有効なブラウザーがインストールされていません。Edge または Chrome をインストールしてください。",
   "Run and Debug: auto-detection found {0} for a launch browser": "実行とデバッグ: 起動ブラウザーの自動検出で {0} が見つかりました",
   "See {0} output": "{0} 出力を参照",
   "Select the process to attach to": "アタッチするプロセスを選択する",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[エラー]: C# 拡張機能でデバッガー パッケージをインストールできませんでした。",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp オプションが変更されました。変更を適用するために、ウィンドウを再読み込みしてください",
   "pipeArgs must be a string or a string array type": "pipeArgs は文字列型または文字列配列型である必要があります",
+  "{0} Keyword": "{0} キーワード",
   "{0} references": "{0} 個の参照",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}、問題の内容を問題の本文として貼り付けます。未記入の詳細があれば忘れずに記入してください。"
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json
index 41112fb7f..859647485 100644
--- a/l10n/bundle.l10n.json
+++ b/l10n/bundle.l10n.json
@@ -30,7 +30,7 @@
   "For more information about the 'console' field, see {0}": "For more information about the 'console' field, see {0}",
   "WARNING": "WARNING",
   "The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\n\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\nIf this allows the server to now load your project then --\n  * Delete this file\n  * Open the Visual Studio Code command palette (View->Command Palette)\n  * run the command: '.NET: Generate Assets for Build and Debug'.\n\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.": "The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\n\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\nIf this allows the server to now load your project then --\n  * Delete this file\n  * Open the Visual Studio Code command palette (View->Command Palette)\n  * run the command: '.NET: Generate Assets for Build and Debug'.\n\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.",
-  "Failed to parse tasks.json file": "Failed to parse tasks.json file",
+  "Failed to parse tasks.json file: {0}": "Failed to parse tasks.json file: {0}",
   "Don't Ask Again": "Don't Ask Again",
   "Required assets to build and debug are missing from '{0}'. Add them?": "Required assets to build and debug are missing from '{0}'. Add them?",
   "Cancel": "Cancel",
@@ -110,6 +110,7 @@
   "Unexpected error when attaching to C# preview window.": "Unexpected error when attaching to C# preview window.",
   "Razor C# copied to clipboard": "Razor C# copied to clipboard",
   "Copy C#": "Copy C#",
+  "{0} Keyword": "{0} Keyword",
   "Unexpected completion trigger kind: {0}": "Unexpected completion trigger kind: {0}",
   "1 reference": "1 reference",
   "{0} references": "{0} references",
@@ -117,7 +118,7 @@
   "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.": "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.",
   "View Debug Docs": "View Debug Docs",
   "Ignore": "Ignore",
-  "Run and Debug: A valid browser is not installed": "Run and Debug: A valid browser is not installed",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "Reload Window": "Reload Window",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
@@ -127,6 +128,8 @@
   "Choose and set default": "Choose and set default",
   "Do not load any": "Do not load any",
   "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# configuration has changed. Would you like to reload the window to apply your changes?",
+  "Pick a fix all scope": "Pick a fix all scope",
+  "Fix All Code Action": "Fix All Code Action",
   "pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",
   "Name not defined in current configuration.": "Name not defined in current configuration.",
   "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.",
diff --git a/l10n/bundle.l10n.ko.json b/l10n/bundle.l10n.ko.json
index fc8ea0337..8e9c562b8 100644
--- a/l10n/bundle.l10n.ko.json
+++ b/l10n/bundle.l10n.ko.json
@@ -42,10 +42,11 @@
   "Extension": "확장",
   "Extensions": "확장",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "C# 확장 설치를 완료하지 못했습니다. 아래 출력 창에서 오류를 확인하세요.",
-  "Failed to parse tasks.json file": "tasks.json 파일을 구문 분석하지 못했습니다.",
+  "Failed to parse tasks.json file: {0}": "tasks.json 파일을 구문 분석하지 못했습니다: {0}",
   "Failed to set debugadpter directory": "debugadpter 디렉터리를 설정하지 못했습니다.",
   "Failed to set extension directory": "확장 디렉터리를 설정하지 못했습니다.",
   "Failed to set install complete file path": "설치 완료 파일 경로를 설정하지 못했습니다.",
+  "Fix All Code Action": "모든 코드 동작 수정",
   "For further information visit {0}": "자세한 내용은 {0}을(를) 방문하세요.",
   "For further information visit {0}.": "자세한 내용은 {0}을(를) 방문하세요.",
   "For more information about the 'console' field, see {0}": "'콘솔' 필드에 대한 자세한 내용은 {0}을(를) 참조하세요.",
@@ -72,6 +73,7 @@
   "Open envFile": "환경 파일 열기",
   "Operating system \"{0}\" not supported.": "운영 체제 \"{0}\"은(는) 지원되지 않습니다.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Razor 문제의 원인이 된 작업 수행(또는 아무 작업도 수행하지 않음)",
+  "Pick a fix all scope": "모든 범위 수정 선택",
   "Pipe transport failed to get OS and processes.": "파이프 전송이 OS 및 프로세스를 가져오지 못했습니다.",
   "Please fill in this section": "이 섹션을 작성하세요.",
   "Press {0}": "{0} 누르기",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "빌드 및 디버그에 필요한 자산이 '{0}'에서 누락되었습니다. 추가하시겠습니까?",
   "Restart": "다시 시작",
   "Restart Language Server": "언어 서버 다시 시작",
-  "Run and Debug: A valid browser is not installed": "실행 및 디버그: 올바른 브라우저가 설치되어 있지 않습니다",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "실행 및 디버그:유효한 브라우저가 설치되어 있지 않습니다. Edge나 Chrome을 설치하세요.",
   "Run and Debug: auto-detection found {0} for a launch browser": "실행 및 디버그: 자동 검색에서 시작 브라우저에 대한 {0} 발견",
   "See {0} output": "{0} 출력 보기",
   "Select the process to attach to": "연결할 프로세스 선택",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[오류]: C# 확장이 디버거 패키지를 설치하지 못했습니다.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp 옵션이 변경되었습니다. 변경 내용을 적용하려면 창을 다시 로드하세요.",
   "pipeArgs must be a string or a string array type": "pipeArgs는 문자열 또는 문자열 배열 유형이어야 합니다.",
+  "{0} Keyword": "{0} 키워드",
   "{0} references": "참조 {0}개",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, 문제 내용을 문제의 본문으로 붙여넣습니다. 작성하지 않은 세부 정보를 잊지 말고 입력합니다."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.pl.json b/l10n/bundle.l10n.pl.json
index 39d33d98f..0085b1be2 100644
--- a/l10n/bundle.l10n.pl.json
+++ b/l10n/bundle.l10n.pl.json
@@ -42,10 +42,11 @@
   "Extension": "Rozszerzenie",
   "Extensions": "Rozszerzenia",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Nie można ukończyć instalacji rozszerzenia języka C#. Zobacz błąd w poniższym oknie danych wyjściowych.",
-  "Failed to parse tasks.json file": "Nie można przeanalizować pliku tasks.json",
+  "Failed to parse tasks.json file: {0}": "Nie można przeanalizować pliku tasks.json: {0}",
   "Failed to set debugadpter directory": "Nie można ustawić katalogu debugadpter",
   "Failed to set extension directory": "Nie można ustawić katalogu rozszerzenia",
   "Failed to set install complete file path": "Nie można ustawić pełnej ścieżki pliku instalacji",
+  "Fix All Code Action": "Napraw całą akcję kodu",
   "For further information visit {0}": "Aby uzyskać więcej informacji, odwiedź witrynę {0}",
   "For further information visit {0}.": "Aby uzyskać więcej informacji, odwiedź witrynę {0}.",
   "For more information about the 'console' field, see {0}": "Aby uzyskać więcej informacji o polu „console”, zobacz {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Otwórz plik envFile",
   "Operating system \"{0}\" not supported.": "System operacyjny „{0}” nie jest obsługiwany.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Wykonaj akcje (lub brak akcji), które spowodowały problem z aparatem Razor",
+  "Pick a fix all scope": "Wybierz poprawkę dla całego zakresu",
   "Pipe transport failed to get OS and processes.": "Transport potokowy nie może pobrać systemu operacyjnego i procesów.",
   "Please fill in this section": "Wypełnij tę sekcję",
   "Press {0}": "Naciśnij {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Brak wymaganych zasobów do kompilowania i debugowania z „{0}”. Dodać je?",
   "Restart": "Uruchom ponownie",
   "Restart Language Server": "Ponownie uruchom serwer języka",
-  "Run and Debug: A valid browser is not installed": "Uruchom i debuguj: prawidłowa przeglądarka nie jest zainstalowana",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Uruchom i debuguj: nie zainstalowano prawidłowej przeglądarki. Zainstaluj przeglądarkę Edge lub Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Uruchamianie i debugowanie: automatyczne wykrywanie znalazło {0} dla przeglądarki uruchamiania",
   "See {0} output": "Zobacz dane wyjściowe {0}",
   "Select the process to attach to": "Wybierz docelowy proces dołączania",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[BŁĄD]: Rozszerzenie języka C# nie może zainstalować pakietu debugera.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Opcja dotnet.server.useOmnisharp została zmieniona. Załaduj ponownie okno, aby zastosować zmianę",
   "pipeArgs must be a string or a string array type": "Argument pipeArgs musi być ciągiem lub typem tablicy ciągów",
+  "{0} Keyword": "Słowo kluczowe {0}",
   "{0} references": "Odwołania: {0}",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, wklej zawartość problemu jako treść problemu. Nie zapomnij wypełnić wszystkich szczegółów, które pozostały niewypełnione."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.pt-br.json b/l10n/bundle.l10n.pt-br.json
index b274a6611..25f471da5 100644
--- a/l10n/bundle.l10n.pt-br.json
+++ b/l10n/bundle.l10n.pt-br.json
@@ -42,10 +42,11 @@
   "Extension": "Extensão",
   "Extensions": "Extensões",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Falha ao concluir a instalação da extensão C#. Confira o erro na janela de saída abaixo.",
-  "Failed to parse tasks.json file": "Falha ao analisar o arquivo tasks.json",
+  "Failed to parse tasks.json file: {0}": "Falha ao analisar o arquivo task.json: {0}",
   "Failed to set debugadpter directory": "Falha ao definir o diretório de depuração",
   "Failed to set extension directory": "Falha ao configurar o diretório da extensão",
   "Failed to set install complete file path": "Falha ao configurar o caminho do arquivo para concluir a instalação",
+  "Fix All Code Action": "Corrigir Todas as Ações de Código",
   "For further information visit {0}": "Para obter mais informações, acesse {0}",
   "For further information visit {0}.": "Para obter mais informações, visite {0}.",
   "For more information about the 'console' field, see {0}": "Para obter mais informações sobre o campo \"console\", confira {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Abrir o envFile",
   "Operating system \"{0}\" not supported.": "Não há suporte para o sistema operacional \"{0}\".",
   "Perform the actions (or no action) that resulted in your Razor issue": "Execute as ações (ou nenhuma ação) que resultaram no problema do seu Razor",
+  "Pick a fix all scope": "Escolher uma correção para todo o escopo",
   "Pipe transport failed to get OS and processes.": "O transporte de pipe falhou ao obter o SO e os processos.",
   "Please fill in this section": "Preencha esta seção",
   "Press {0}": "Pressione {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Os ativos necessários para compilar e depurar estão ausentes de \"{0}\". Deseja adicioná-los?",
   "Restart": "Reiniciar",
   "Restart Language Server": "Reiniciar o Servidor de Linguagem",
-  "Run and Debug: A valid browser is not installed": "Executar e depurar: um navegador válido não está instalado",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Executar e depurar: um navegador válido não está instalado. Instale o Edge ou o Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Executar e depurar: detecção automática encontrada {0} para um navegador de inicialização",
   "See {0} output": "Ver a saída de {0}",
   "Select the process to attach to": "Selecione o processo ao qual anexar",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERRO]: a extensão C# falhou ao instalar o pacote do depurador.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "A opção dotnet.server.useOmnisharp foi alterada. Atualize a janela para aplicar a alteração",
   "pipeArgs must be a string or a string array type": "pipeArgs deve ser uma cadeia de caracteres ou um tipo de matriz de cadeia de caracteres",
+  "{0} Keyword": "{0} Palavra-chave",
   "{0} references": "{0} referências",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, cole o conteúdo do problema como o corpo do problema. Não se esqueça de preencher todos os detalhes que não foram preenchidos."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.ru.json b/l10n/bundle.l10n.ru.json
index f0827570c..896ffd3e3 100644
--- a/l10n/bundle.l10n.ru.json
+++ b/l10n/bundle.l10n.ru.json
@@ -42,10 +42,11 @@
   "Extension": "Расширение",
   "Extensions": "Расширения",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Не удалось завершить установку расширения C#. См. ошибку в окне вывода ниже.",
-  "Failed to parse tasks.json file": "Не удалось проанализировать файл tasks.json.",
+  "Failed to parse tasks.json file: {0}": "Не удалось проанализировать файл tasks.json: {0}",
   "Failed to set debugadpter directory": "Не удалось установить каталог отладчика",
   "Failed to set extension directory": "Не удалось установить каталог расширений",
   "Failed to set install complete file path": "Не удалось установить полный путь к файлу установки",
+  "Fix All Code Action": "Исправить все действия с кодом",
   "For further information visit {0}": "Для получения дополнительных сведений посетите {0}",
   "For further information visit {0}.": "Для получения дополнительных сведений посетите {0}.",
   "For more information about the 'console' field, see {0}": "Дополнительные сведения о поле \"console\" см. в {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "Открыть envFile",
   "Operating system \"{0}\" not supported.": "Операционная система \"{0}\" не поддерживается.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Выполните действия (или воспроизведите условия), которые вызвали проблему Razor",
+  "Pick a fix all scope": "Выбрать исправление для всей области",
   "Pipe transport failed to get OS and processes.": "Транспорту канала не удалось получить ОС и процессы.",
   "Please fill in this section": "Заполните этот раздел",
   "Press {0}": "Нажмите {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Необходимые ресурсы для сборки и отладки отсутствуют в \"{0}\". Добавить их?",
   "Restart": "Перезапустить",
   "Restart Language Server": "Перезапустить языковой сервер",
-  "Run and Debug: A valid browser is not installed": "Запуск и отладка: не установлен допустимый браузер",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Запуск и отладка: не установлен допустимый браузер. Установите Microsoft Edge или Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Запуск и отладка: для браузера запуска автоматически обнаружено {0}",
   "See {0} output": "Просмотреть выходные данные {0}",
   "Select the process to attach to": "Выберите процесс, к которому нужно выполнить подключение",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[ОШИБКА]: расширению C# не удалось установить пакет отладчика.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Параметр dotnet.server.useOmnisharp изменен. Перезагрузите окно, чтобы применить изменение",
   "pipeArgs must be a string or a string array type": "pipeArgs должен быть строкой или строковым массивом",
+  "{0} Keyword": "Ключевое слово: {0}",
   "{0} references": "Ссылок: {0}",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, вставьте описание проблемы в соответствующее поле. Не забудьте указать все необходимые сведения."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.tr.json b/l10n/bundle.l10n.tr.json
index c1c2342aa..f55d1e93e 100644
--- a/l10n/bundle.l10n.tr.json
+++ b/l10n/bundle.l10n.tr.json
@@ -42,10 +42,11 @@
   "Extension": "Uzantı",
   "Extensions": "Uzantılar",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "C# uzantısının yüklenmesi tamamlanamadı. Lütfen aşağıdaki çıkış penceresindeki hataya bakın.",
-  "Failed to parse tasks.json file": "tasks.json dosyası ayrıştırılamadı",
+  "Failed to parse tasks.json file: {0}": "tasks.json dosyası ayrıştırılamadı: {0}",
   "Failed to set debugadpter directory": "Hata ayıklayıcı dizini ayarlanamadı",
   "Failed to set extension directory": "Uzantı dizini ayarlanamadı",
   "Failed to set install complete file path": "Tam dosya yolu yüklemesi ayarlanamadı",
+  "Fix All Code Action": "Tümünü Düzelt Kod Eylemi",
   "For further information visit {0}": "Daha fazla bilgi için bkz. {0}",
   "For further information visit {0}.": "Daha fazla bilgi için bkz. {0}.",
   "For more information about the 'console' field, see {0}": "'Konsol' alanı hakkında daha fazla bilgi için bkz. {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "envFile’ı aç",
   "Operating system \"{0}\" not supported.": "\"{0}\" işletim sistemi desteklenmiyor.",
   "Perform the actions (or no action) that resulted in your Razor issue": "Razor sorunuzla sonuçlanan eylemleri gerçekleştirin (veya eylem gerçekleştirmeyin)",
+  "Pick a fix all scope": "Tümünü düzelt kapsamı seçin",
   "Pipe transport failed to get OS and processes.": "Kanal aktarımı, işletim sistemini ve işlemleri alamadı.",
   "Please fill in this section": "Lütfen bu bölümü doldurun",
   "Press {0}": "{0} tuşuna basın",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "'{0}' derleme ve hata ayıklama için gerekli varlıklara sahip değil. Eklensin mi?",
   "Restart": "Yeniden Başlat",
   "Restart Language Server": "Dil Sunucusunu Yeniden Başlat",
-  "Run and Debug: A valid browser is not installed": "Çalıştır ve Hata Ayıkla: Geçerli bir tarayıcı yüklü değil",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Çalıştır ve Hata Ayıkla: Geçerli bir tarayıcı yüklü değil. Lütfen Edge veya Chrome tarayıcısını yükleyin.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Çalıştır ve Hata Ayıkla: otomatik algılama bir başlatma tarayıcısı için {0} buldu",
   "See {0} output": "{0} çıktısını göster",
   "Select the process to attach to": "Eklenilecek işlemi seçin",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[HATA]: C# Uzantısı hata ayıklayıcı paketini yükleyemedi.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp seçeneği değiştirildi. Değişikliği uygulamak için lütfen pencereyi yeniden yükleyin",
   "pipeArgs must be a string or a string array type": "pipeArgs bir dize veya dize dizisi türü olmalıdır",
+  "{0} Keyword": "{0} Anahtar Sözcüğü",
   "{0} references": "{0} başvuru",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, sorun içeriklerinizi sorunun gövdesi olarak yapıştırın. Daha sonrasında doldurulmamış olan ayrıntıları sağlamayı unutmayın."
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.zh-cn.json b/l10n/bundle.l10n.zh-cn.json
index c1fca461a..c33b83d97 100644
--- a/l10n/bundle.l10n.zh-cn.json
+++ b/l10n/bundle.l10n.zh-cn.json
@@ -42,10 +42,11 @@
   "Extension": "扩展",
   "Extensions": "扩展",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "无法完成 C# 扩展的安装。请在下面的输出窗口中查看错误。",
-  "Failed to parse tasks.json file": "未能分析 tasks.json 文件",
+  "Failed to parse tasks.json file: {0}": "未能分析 tasks.json 文件: {0}",
   "Failed to set debugadpter directory": "未能设置调试程序目录",
   "Failed to set extension directory": "无法设置扩展目录",
   "Failed to set install complete file path": "无法设置安装完成文件路径",
+  "Fix All Code Action": "修复所有代码操作",
   "For further information visit {0}": "有关详细信息，请访问 {0}",
   "For further information visit {0}.": "有关详细信息，请访问 {0}。",
   "For more information about the 'console' field, see {0}": "有关“控制台”字段的详细信息，请参阅 {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "打开 envFile",
   "Operating system \"{0}\" not supported.": "不支持操作系统“{0}”。",
   "Perform the actions (or no action) that resulted in your Razor issue": "执行导致出现 Razor 问题的操作(或不执行任何操作)",
+  "Pick a fix all scope": "选取所有范围的修补程序",
   "Pipe transport failed to get OS and processes.": "管道传输未能获取 OS 和进程。",
   "Please fill in this section": "请填写此部分",
   "Press {0}": "按 {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "\"{0}\" 中缺少生成和调试所需的资产。添加它们?",
   "Restart": "重启",
   "Restart Language Server": "重启语言服务器",
-  "Run and Debug: A valid browser is not installed": "运行和调试: 未安装有效的浏览器",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "运行和调试: 未安装有效的浏览器。请安装 Microsoft Edge 或 Chrome。",
   "Run and Debug: auto-detection found {0} for a launch browser": "运行和调试: 为启动浏览器找到 {0} 自动检测",
   "See {0} output": "查看 {0} 输出",
   "Select the process to attach to": "选择要附加到的进程",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[错误]: C# 扩展无法安装调试器包。",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp 选项已更改。请重新加载窗口以应用更改",
   "pipeArgs must be a string or a string array type": "pipeArgs 必须是字符串或字符串数组类型",
+  "{0} Keyword": "{0} 关键字",
   "{0} references": "{0} 个引用",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}，将问题内容粘贴为问题的正文。请记得填写任何未填充的详细信息。"
 }
\ No newline at end of file
diff --git a/l10n/bundle.l10n.zh-tw.json b/l10n/bundle.l10n.zh-tw.json
index 4257fe9c3..26ab8d3d7 100644
--- a/l10n/bundle.l10n.zh-tw.json
+++ b/l10n/bundle.l10n.zh-tw.json
@@ -42,10 +42,11 @@
   "Extension": "延伸模組",
   "Extensions": "延伸模組",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "無法完成 C# 延伸模組的安裝。請參閱下列輸出視窗中的錯誤。",
-  "Failed to parse tasks.json file": "無法剖析 tasks.json 檔案",
+  "Failed to parse tasks.json file: {0}": "無法剖析 tasks.json 檔案: {0}",
   "Failed to set debugadpter directory": "無法設定 debugadpter 目錄",
   "Failed to set extension directory": "無法設定延伸模組目錄",
   "Failed to set install complete file path": "無法設定安裝完整檔案路徑",
+  "Fix All Code Action": "修正所有程式碼動作",
   "For further information visit {0}": "如需詳細資訊，請造訪 {0}",
   "For further information visit {0}.": "如需詳細資訊，請造訪 {0}。",
   "For more information about the 'console' field, see {0}": "如需 [主控台] 欄位的詳細資訊，請參閱 {0}",
@@ -72,6 +73,7 @@
   "Open envFile": "開啟 envFile",
   "Operating system \"{0}\" not supported.": "不支援作業系統 \"{0}\"。",
   "Perform the actions (or no action) that resulted in your Razor issue": "執行導致 Razor 問題的動作 (或不執行動作)",
+  "Pick a fix all scope": "選擇修正所有範圍",
   "Pipe transport failed to get OS and processes.": "管道傳輸無法取得 OS 和處理序。",
   "Please fill in this section": "請填寫此區段",
   "Press {0}": "按 {0}",
@@ -99,7 +101,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "'{0}' 缺少建置和偵錯所需的資產。要新增嗎?",
   "Restart": "重新啟動",
   "Restart Language Server": "重新啟動語言伺服器",
-  "Run and Debug: A valid browser is not installed": "執行並偵錯: 未安裝有效的瀏覽器",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "執行和偵錯工具: 未安裝有效的瀏覽器。請安裝 Edge 或 Chrome。",
   "Run and Debug: auto-detection found {0} for a launch browser": "執行並偵錯: 針對啟動瀏覽器找到 {0} 自動偵測",
   "See {0} output": "查看 {0} 輸出",
   "Select the process to attach to": "選取要附加至的目標處理序",
@@ -150,6 +152,7 @@
   "[ERROR]: C# Extension failed to install the debugger package.": "[錯誤]: C# 延伸模組無法安裝偵錯工具套件。",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp 選項已變更。請重新載入視窗以套用變更",
   "pipeArgs must be a string or a string array type": "pipeArgs 必須是字串或字串陣列類型",
+  "{0} Keyword": "{0} 關鍵字",
   "{0} references": "{0} 個參考",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}，將您的問題內容貼上作為問題的本文。別忘了填寫任何未填入的詳細資料。"
 }
\ No newline at end of file
diff --git a/omnisharptest/omnisharpFeatureTests/assets.test.ts b/omnisharptest/omnisharpFeatureTests/assets.test.ts
index 5c44e8012..84121077a 100644
--- a/omnisharptest/omnisharpFeatureTests/assets.test.ts
+++ b/omnisharptest/omnisharpFeatureTests/assets.test.ts
@@ -78,7 +78,7 @@ suite('Asset generation: csproj', () => {
         // We do not check the watch task since this parameter can break hot reload scenarios.
         tasksJson.tasks
             .filter((task) => task.label !== 'watch')
-            .forEach((task) => task.args!.should.contain('/consoleloggerparameters:NoSummary'));
+            .forEach((task) => task.args!.should.contain('/consoleloggerparameters:NoSummary;ForceNoAlign'));
     });
 
     test("Generated 'watch' task does not have the property GenerateFullPaths set to true ", () => {
@@ -111,7 +111,7 @@ suite('Asset generation: csproj', () => {
 
         const watchTask = tasksJson.tasks!.find((task) => task.label === 'watch');
         isNotNull(watchTask?.args);
-        watchTask.args.should.not.contain('/consoleloggerparameters:NoSummary');
+        watchTask.args.should.not.contain('/consoleloggerparameters:NoSummary;ForceNoAlign');
     });
 
     test('Create tasks.json for nested project opened in workspace', () => {
diff --git a/omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts
index d8a0aba92..a8845a1dc 100644
--- a/omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts
@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { expect, should } from 'chai';
 import * as path from 'path';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 import { Advisor } from '../../src/features/diagnosticsProvider';
 
diff --git a/omnisharptest/omnisharpIntegrationTests/codeActionRename.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/codeActionRename.integration.test.ts
index d8b9dff2a..bb0484903 100644
--- a/omnisharptest/omnisharpIntegrationTests/codeActionRename.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/codeActionRename.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 
 import { should, expect } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import * as path from 'path';
 import { assertWithPoll } from './poll';
 import { isNotNull } from '../testUtil';
diff --git a/omnisharptest/omnisharpIntegrationTests/codeLensProvider.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/codeLensProvider.integration.test.ts
index 6ce594408..5eb764de2 100644
--- a/omnisharptest/omnisharpIntegrationTests/codeLensProvider.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/codeLensProvider.integration.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { should, expect } from 'chai';
 import { activateCSharpExtension, isSlnWithCsproj, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { isNotNull } from '../testUtil';
 
 suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
@@ -117,7 +117,7 @@ suite(`CodeLensProvider options: ${testAssetWorkspace.description}`, function ()
         await csharpConfig.update('codeLens.enableTestsCodeLens', false);
 
         const codeLenses = await GetCodeLenses(fileUri, 100);
-        expect(codeLenses.length).to.equal(2);
+        expect(codeLenses.length).to.equal(3);
 
         for (const codeLens of codeLenses) {
             expect(codeLens.isResolved).to.be.true;
diff --git a/omnisharptest/omnisharpIntegrationTests/completionProvider.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/completionProvider.integration.test.ts
index 87ea52127..b96c7130e 100644
--- a/omnisharptest/omnisharpIntegrationTests/completionProvider.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/completionProvider.integration.test.ts
@@ -5,7 +5,7 @@
 
 import OmniSharpCompletionProvider from '../../src/features/completionProvider';
 import * as vscode from 'vscode';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import * as path from 'path';
 import { use, expect, should } from 'chai';
 import * as chaiArray from 'chai-arrays';
@@ -93,7 +93,7 @@ suite(`${OmniSharpCompletionProvider.name}: Returns the completion items`, () =>
                 sawAdditionalTextEdits = true;
                 expect(i.additionalTextEdits).to.be.array();
                 expect(i.additionalTextEdits.length).to.equal(1);
-                expect(i.additionalTextEdits[0].newText).to.equal('using singleCsproj2;\n');
+                expect(normalizeNewlines(i.additionalTextEdits[0].newText)).to.equal('using singleCsproj2;\n');
                 expect(i.additionalTextEdits[0].range.start.line).to.equal(1);
                 expect(i.additionalTextEdits[0].range.start.character).to.equal(0);
                 expect(i.additionalTextEdits[0].range.end.line).to.equal(1);
@@ -107,4 +107,10 @@ suite(`${OmniSharpCompletionProvider.name}: Returns the completion items`, () =>
         expect(sawAdditionalTextEdits).to.be.true;
         expect(sawEmptyAdditionalTextEdits).to.be.true;
     });
+
+    function normalizeNewlines(text: string) {
+        // using directives are now added with the line ending used by other
+        // using directives in the file instead of the formatting option end_of_line.
+        return text.replaceAll('\r\n', '\n');
+    }
 });
diff --git a/omnisharptest/omnisharpIntegrationTests/definitionProvider.test.ts b/omnisharptest/omnisharpIntegrationTests/definitionProvider.test.ts
index a8daa92af..6683038f7 100644
--- a/omnisharptest/omnisharpIntegrationTests/definitionProvider.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/definitionProvider.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
 import * as path from 'path';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { expect, should } from 'chai';
 import {
     activateCSharpExtension,
diff --git a/omnisharptest/omnisharpIntegrationTests/diagnostics.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/diagnostics.integration.test.ts
index c3c0a7386..d1eda9ab3 100644
--- a/omnisharptest/omnisharpIntegrationTests/diagnostics.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/diagnostics.integration.test.ts
@@ -13,7 +13,7 @@ import {
     isSlnWithGenerator,
     restartOmniSharpServer,
 } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { poll, assertWithPoll, pollDoesNotHappen } from './poll';
 import { isNotNull } from '../testUtil';
 
diff --git a/omnisharptest/omnisharpIntegrationTests/documentSymbolProvider.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/documentSymbolProvider.integration.test.ts
index cf3fe0b4b..eca66ae76 100644
--- a/omnisharptest/omnisharpIntegrationTests/documentSymbolProvider.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/documentSymbolProvider.integration.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { should, expect } from 'chai';
 import * as integrationHelpers from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 suite(`DocumentSymbolProvider: ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
diff --git a/omnisharptest/omnisharpIntegrationTests/documentationCommentAutoFormatting.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/documentationCommentAutoFormatting.integration.test.ts
index 902c83896..f5fa7a1de 100644
--- a/omnisharptest/omnisharpIntegrationTests/documentationCommentAutoFormatting.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/documentationCommentAutoFormatting.integration.test.ts
@@ -8,7 +8,7 @@ import * as chaiArray from 'chai-arrays';
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 use(chaiArray);
 
diff --git a/omnisharptest/omnisharpIntegrationTests/dotnetTest.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/dotnetTest.integration.test.ts
index 4bbd5f4b3..894c2f1b2 100644
--- a/omnisharptest/omnisharpIntegrationTests/dotnetTest.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/dotnetTest.integration.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { should, expect } from 'chai';
 import { activateCSharpExtension, isSlnWithCsproj } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { EventStream } from '../../src/eventStream';
 import { EventType } from '../../src/omnisharp/eventType';
 import { OmnisharpRequestMessage } from '../../src/omnisharp/loggingEvents';
@@ -47,8 +47,8 @@ suite(`DotnetTest: ${testAssetWorkspace.description}`, function () {
     });
 
     test('Undefined runsettings path is unchanged', async function () {
-        const omnisharpConfig = vscode.workspace.getConfiguration('omnisharp');
-        await omnisharpConfig.update('testRunSettings', undefined);
+        const omnisharpConfig = vscode.workspace.getConfiguration('dotnet');
+        await omnisharpConfig.update('unitTests.runSettingsPath', undefined);
 
         const eventWaiter = testAssetWorkspace.waitForEvent<OmnisharpRequestMessage>(
             eventStream,
@@ -69,8 +69,8 @@ suite(`DotnetTest: ${testAssetWorkspace.description}`, function () {
         const relativeRunSettingsPath = `.\\settings\\TestSettings.runsettings`.replace('\\', path.sep);
         const absoluteRunSettingsPath = path.join(process.cwd(), relativeRunSettingsPath);
 
-        const omnisharpConfig = vscode.workspace.getConfiguration('omnisharp');
-        await omnisharpConfig.update('testRunSettings', absoluteRunSettingsPath);
+        const omnisharpConfig = vscode.workspace.getConfiguration('dotnet');
+        await omnisharpConfig.update('unitTests.runSettingsPath', absoluteRunSettingsPath);
 
         const eventWaiter = testAssetWorkspace.waitForEvent<OmnisharpRequestMessage>(
             eventStream,
@@ -91,8 +91,8 @@ suite(`DotnetTest: ${testAssetWorkspace.description}`, function () {
         const endingPath = 'settings\\TestSettings.runsettings'.replace('\\', path.sep);
         const relativeRunSettingPath = `.\\${endingPath}`.replace('\\', path.sep);
 
-        const omnisharpConfig = vscode.workspace.getConfiguration('omnisharp');
-        await omnisharpConfig.update('testRunSettings', relativeRunSettingPath);
+        const omnisharpConfig = vscode.workspace.getConfiguration('dotnet');
+        await omnisharpConfig.update('unitTests.runSettingsPath', relativeRunSettingPath);
 
         const eventWaiter = testAssetWorkspace.waitForEvent<OmnisharpRequestMessage>(
             eventStream,
diff --git a/omnisharptest/omnisharpIntegrationTests/hoverProvider.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/hoverProvider.integration.test.ts
index f835fe8b5..1b5273e12 100644
--- a/omnisharptest/omnisharpIntegrationTests/hoverProvider.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/hoverProvider.integration.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { should, expect } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 export type Test = 'a' | 'b' | ['c', any];
 
diff --git a/omnisharptest/omnisharpIntegrationTests/implementationProvider.test.ts b/omnisharptest/omnisharpIntegrationTests/implementationProvider.test.ts
index 570530ce6..8582905ec 100644
--- a/omnisharptest/omnisharpIntegrationTests/implementationProvider.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/implementationProvider.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import OmniSharpImplementationProvider from '../../src/features/implementationProvider';
 import * as path from 'path';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 
diff --git a/omnisharptest/omnisharpIntegrationTests/inlayHints.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/inlayHints.integration.test.ts
index 2b01d5019..c6d0023d7 100644
--- a/omnisharptest/omnisharpIntegrationTests/inlayHints.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/inlayHints.integration.test.ts
@@ -12,7 +12,7 @@ import {
     isSlnWithGenerator,
     restartOmniSharpServer,
 } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import * as path from 'path';
 import { InlayHint, LinePositionSpanTextChange } from '../../src/omnisharp/protocol';
 import { isNotNull } from '../testUtil';
diff --git a/omnisharptest/omnisharpIntegrationTests/languageMiddleware.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/languageMiddleware.integration.test.ts
index b85c2dbf8..b5c7204ba 100644
--- a/omnisharptest/omnisharpIntegrationTests/languageMiddleware.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/languageMiddleware.integration.test.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import * as path from 'path';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 import { LanguageMiddleware, LanguageMiddlewareFeature } from '../../src/omnisharp/languageMiddlewareFeature';
diff --git a/omnisharptest/omnisharpIntegrationTests/launchConfiguration.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/launchConfiguration.integration.test.ts
index 4259da579..1b8249bfa 100644
--- a/omnisharptest/omnisharpIntegrationTests/launchConfiguration.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/launchConfiguration.integration.test.ts
@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 
 import { should, expect } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { poll } from './poll';
 import { isNotNull } from '../testUtil';
 
diff --git a/omnisharptest/omnisharpIntegrationTests/reAnalyze.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/reAnalyze.integration.test.ts
index d265040f0..e03541bad 100644
--- a/omnisharptest/omnisharpIntegrationTests/reAnalyze.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/reAnalyze.integration.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { should, expect } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { poll, assertWithPoll } from './poll';
 import { EventStream } from '../../src/eventStream';
 import { EventType } from '../../src/omnisharp/eventType';
diff --git a/omnisharptest/omnisharpIntegrationTests/referenceProvider.test.ts b/omnisharptest/omnisharpIntegrationTests/referenceProvider.test.ts
index 35cc1f567..71bc637ea 100644
--- a/omnisharptest/omnisharpIntegrationTests/referenceProvider.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/referenceProvider.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import OmniSharpReferenceProvider from '../../src/features/referenceProvider';
 import * as path from 'path';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 
diff --git a/omnisharptest/omnisharpIntegrationTests/semanticTokensProvider.test.ts b/omnisharptest/omnisharpIntegrationTests/semanticTokensProvider.test.ts
index 419e17a9f..c8aabbb49 100644
--- a/omnisharptest/omnisharpIntegrationTests/semanticTokensProvider.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/semanticTokensProvider.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { should, assert } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 interface ExpectedToken {
     startLine: number;
diff --git a/omnisharptest/omnisharpIntegrationTests/signatureHelp.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/signatureHelp.integration.test.ts
index a501c619d..3e16d1268 100644
--- a/omnisharptest/omnisharpIntegrationTests/signatureHelp.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/signatureHelp.integration.test.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 suite(`SignatureHelp: ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
diff --git a/omnisharptest/omnisharpIntegrationTests/sourceGeneratorDefinitionProvider.test.ts b/omnisharptest/omnisharpIntegrationTests/sourceGeneratorDefinitionProvider.test.ts
index eedde2600..4585c3df7 100644
--- a/omnisharptest/omnisharpIntegrationTests/sourceGeneratorDefinitionProvider.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/sourceGeneratorDefinitionProvider.test.ts
@@ -9,7 +9,7 @@ import * as path from 'path';
 import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
 import { activateCSharpExtension, isSlnWithGenerator, restartOmniSharpServer } from './integrationHelpers';
 import { assertWithPoll, sleep } from './poll';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 suite(`${OmniSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/activeTestAssetWorkspace.ts b/omnisharptest/omnisharpIntegrationTests/testAssets/activeTestAssetWorkspace.ts
new file mode 100644
index 000000000..2bf613dc0
--- /dev/null
+++ b/omnisharptest/omnisharpIntegrationTests/testAssets/activeTestAssetWorkspace.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+
+import { ITestAssetWorkspace } from '../../../test/integrationTests/testAssets/testAssets';
+
+import singleCsproj from '../../../test/integrationTests/testAssets/singleCsproj';
+import slnWithCsproj from '../../../test/integrationTests/testAssets/slnWithCsproj';
+import slnFilterWithCsproj from '../../../test/integrationTests/testAssets/slnFilterWithCsproj';
+import BasicRazorApp2_1 from '../../../test/integrationTests/testAssets/basicRazorApp21';
+import slnWithGenerator from '../../../test/integrationTests/testAssets/slnWithGenerator';
+import { OmnisharpTestAssetWorkspace } from './omnisharpTestAssetWorkspace';
+
+const testAssetWorkspaces: { [x: string]: ITestAssetWorkspace } = {
+    singleCsproj,
+    slnWithCsproj,
+    slnFilterWithCsproj,
+    BasicRazorApp2_1,
+    slnWithGenerator,
+};
+
+const workspaceName = vscode.workspace.workspaceFolders![0].uri.fsPath.split(path.sep).pop();
+
+const activeTestAssetWorkspace = new OmnisharpTestAssetWorkspace(testAssetWorkspaces[workspaceName!]);
+
+export default activeTestAssetWorkspace;
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/testAssets.ts b/omnisharptest/omnisharpIntegrationTests/testAssets/omnisharpTestAssetWorkspace.ts
similarity index 54%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/testAssets.ts
rename to omnisharptest/omnisharpIntegrationTests/testAssets/omnisharpTestAssetWorkspace.ts
index 07ef976a3..a41fe54bf 100644
--- a/omnisharptest/omnisharpIntegrationTests/testAssets/testAssets.ts
+++ b/omnisharptest/omnisharpIntegrationTests/testAssets/omnisharpTestAssetWorkspace.ts
@@ -3,40 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'async-file';
-import * as path from 'path';
 import * as vscode from 'vscode';
 import { EventStream } from '../../../src/eventStream';
 import { EventType } from '../../../src/omnisharp/eventType';
 import { BaseEvent } from '../../../src/omnisharp/loggingEvents';
-import { ActivationResult } from '../integrationHelpers';
 import { poll } from '../poll';
-import spawnGit from './spawnGit';
-
-export class TestAssetProject {
-    constructor(project: ITestAssetProject) {
-        this.relativeFilePath = project.relativeFilePath;
-    }
-
-    relativeFilePath: string;
-
-    get projectDirectoryPath(): string {
-        return path.join(vscode.workspace.workspaceFolders![0].uri.fsPath, path.dirname(this.relativeFilePath));
-    }
-
-    async addFileWithContents(fileName: string, contents: string): Promise<vscode.Uri> {
-        const dir = this.projectDirectoryPath;
-        const loc = path.join(dir, fileName);
-        await fs.writeTextFile(loc, contents);
-        return vscode.Uri.file(loc);
-    }
-}
+import { ITestAssetWorkspace, TestAssetWorkspace } from '../../../test/integrationTests/testAssets/testAssets';
+import { ActivationResult } from '../integrationHelpers';
 
-export class TestAssetWorkspace {
+export class OmnisharpTestAssetWorkspace extends TestAssetWorkspace {
     constructor(workspace: ITestAssetWorkspace) {
-        this.projects = workspace.projects.map((w) => new TestAssetProject(w));
-
-        this.description = workspace.description;
+        super(workspace);
     }
 
     async restore(): Promise<void> {
@@ -103,48 +80,4 @@ export class TestAssetWorkspace {
 
         subscription.unsubscribe();
     }
-
-    get vsCodeDirectoryPath(): string {
-        return path.join(vscode.workspace.workspaceFolders![0].uri.fsPath, '.vscode');
-    }
-
-    get launchJsonPath(): string {
-        return path.join(this.vsCodeDirectoryPath, 'launch.json');
-    }
-
-    get tasksJsonPath(): string {
-        return path.join(this.vsCodeDirectoryPath, 'tasks.json');
-    }
-
-    async cleanupWorkspace(): Promise<void> {
-        const workspaceRootPath = vscode.workspace.workspaceFolders![0].uri.fsPath;
-        const cleanUpRoutine = async () => {
-            await vscode.commands.executeCommand('workbench.action.closeAllEditors');
-            await spawnGit(['clean', '-xdf', '.'], { cwd: workspaceRootPath });
-            await spawnGit(['checkout', '--', '.'], { cwd: workspaceRootPath });
-        };
-
-        const sleep = async () => new Promise((resolve) => setTimeout(resolve, 2 * 1000));
-
-        try {
-            await cleanUpRoutine();
-        } catch (error) {
-            // Its possible that cleanup fails for locked files etc, for this reason retry is added.
-            await sleep();
-            await cleanUpRoutine();
-        }
-    }
-
-    description: string;
-
-    projects: TestAssetProject[];
-}
-
-export interface ITestAssetProject {
-    relativeFilePath: string;
-}
-
-export interface ITestAssetWorkspace {
-    description: string;
-    projects: ITestAssetProject[];
 }
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/a_FirstInOrder_SlnFile.sln b/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/a_FirstInOrder_SlnFile.sln
deleted file mode 100644
index 96b8b7c42..000000000
--- a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/a_FirstInOrder_SlnFile.sln
+++ /dev/null
@@ -1,85 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31321.278
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D28FC441-C95D-47D2-8D5C-E401ABAD7C64}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app", "src\app\app.csproj", "{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "lib", "src\lib\lib.csproj", "{717BE881-D74C-45FC-B55D-2085499E1BF8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{4679428B-0CA0-4228-B8C0-B676B34A1B30}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator\generator.csproj", "{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x64.ActiveCfg = Debug|x64
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x64.Build.0 = Debug|x64
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x86.ActiveCfg = Debug|x86
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x86.Build.0 = Debug|x86
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x64.ActiveCfg = Release|x64
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x64.Build.0 = Release|x64
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x86.ActiveCfg = Release|x86
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x86.Build.0 = Release|x86
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x64.Build.0 = Debug|x64
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x86.ActiveCfg = Debug|x86
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x86.Build.0 = Debug|x86
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x64.ActiveCfg = Release|x64
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x64.Build.0 = Release|x64
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x86.ActiveCfg = Release|x86
-		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x86.Build.0 = Release|x86
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x64.ActiveCfg = Debug|x64
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x64.Build.0 = Debug|x64
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x86.ActiveCfg = Debug|x86
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x86.Build.0 = Debug|x86
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x64.ActiveCfg = Release|x64
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x64.Build.0 = Release|x64
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x86.ActiveCfg = Release|x86
-		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x86.Build.0 = Release|x86
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Debug|x64.Build.0 = Debug|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Debug|x86.Build.0 = Debug|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Release|x64.ActiveCfg = Release|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Release|x64.Build.0 = Release|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Release|x86.ActiveCfg = Release|Any CPU
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
-		{717BE881-D74C-45FC-B55D-2085499E1BF8} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
-		{DCFDBE2E-0540-4A9F-AFB7-4CF1F3854440} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7E415A9E-6E39-41C7-A400-051ADE582087}
-	EndGlobalSection
-EndGlobal
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/test/test.csproj b/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/test/test.csproj
deleted file mode 100644
index 9f52c5381..000000000
--- a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/test/test.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/omnisharptest/omnisharpIntegrationTests/typeDefinitionProvider.test.ts b/omnisharptest/omnisharpIntegrationTests/typeDefinitionProvider.test.ts
index 7ae1aa03b..121a67ad1 100644
--- a/omnisharptest/omnisharpIntegrationTests/typeDefinitionProvider.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/typeDefinitionProvider.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
 import * as path from 'path';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { expect, should } from 'chai';
 import {
     activateCSharpExtension,
diff --git a/omnisharptest/omnisharpIntegrationTests/virtualDocumentTracker.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/virtualDocumentTracker.integration.test.ts
index d2a726418..64df57f10 100644
--- a/omnisharptest/omnisharpIntegrationTests/virtualDocumentTracker.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/virtualDocumentTracker.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 
 import { expect, should } from 'chai';
 import { activateCSharpExtension, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { IDisposable } from '../../src/disposable';
 
 suite(`Virtual Document Tracking ${testAssetWorkspace.description}`, function () {
diff --git a/omnisharptest/omnisharpIntegrationTests/workspaceSymbolProvider.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/workspaceSymbolProvider.integration.test.ts
index 6ef129bce..fd14cd18c 100644
--- a/omnisharptest/omnisharpIntegrationTests/workspaceSymbolProvider.integration.test.ts
+++ b/omnisharptest/omnisharpIntegrationTests/workspaceSymbolProvider.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 
 import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
-import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 suite(`WorkspaceSymbolProvider: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
diff --git a/omnisharptest/omnisharpUnitTests/absolutePath.test.ts b/omnisharptest/omnisharpUnitTests/absolutePath.test.ts
index ae4126b48..9706a2dc8 100644
--- a/omnisharptest/omnisharpUnitTests/absolutePath.test.ts
+++ b/omnisharptest/omnisharpUnitTests/absolutePath.test.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { expect } from 'chai';
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
 import { AbsolutePath } from '../../src/packageManager/absolutePath';
 import { TmpAsset, CreateTmpFile } from '../../src/createTmpAsset';
 import { join } from 'path';
 
-suite(AbsolutePath.name, () => {
+describe(AbsolutePath.name, () => {
     let tmpPath: TmpAsset;
 
-    setup(async () => {
+    beforeEach(async () => {
         tmpPath = await CreateTmpFile();
     });
 
-    teardown(() => {
+    afterEach(() => {
         tmpPath.dispose();
     });
 
     test('Throws error when the passed value is not an absolute path', () => {
-        expect(() => new AbsolutePath('somePath')).to.throw(Error);
+        expect(() => new AbsolutePath('somePath')).toThrow(Error);
     });
 
     test(`${AbsolutePath.getAbsolutePath.name}: Returns an absolute path based by resolving the path with the value to prepend`, () => {
         const absolutePath = AbsolutePath.getAbsolutePath(tmpPath.name, 'somePath');
-        expect(absolutePath.value).to.be.equal(join(tmpPath.name, 'somePath'));
+        expect(absolutePath.value).toEqual(join(tmpPath.name, 'somePath'));
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/common.test.ts b/omnisharptest/omnisharpUnitTests/common.test.ts
index 2f2684f9d..7a669de93 100644
--- a/omnisharptest/omnisharpUnitTests/common.test.ts
+++ b/omnisharptest/omnisharpUnitTests/common.test.ts
@@ -3,82 +3,79 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect } from '@jest/globals';
 import * as path from 'path';
 
 import { isSubfolderOf, safeLength, sum } from '../../src/common';
 
-import { should, expect } from 'chai';
-
-suite('Common', () => {
-    suiteSetup(() => should());
-
-    suite('safeLength', () => {
+describe('Common', () => {
+    describe('safeLength', () => {
         test('return 0 for empty array', () => {
             const array: any[] = [];
             const result = safeLength(array);
-            result.should.equal(0);
+            expect(result).toBe(0);
         });
 
         test('returns 5 for array of 5 elements', () => {
             const array = [1, 2, 3, 4, 5];
             const result = safeLength(array);
-            result.should.equal(5);
+            expect(result).toBe(5);
         });
 
         test('returns 0 for undefined', () => {
             const array = undefined;
             const result = safeLength(array);
-            result.should.equal(0);
+            expect(result).toBe(0);
         });
     });
 
-    suite('sum', () => {
+    describe('sum', () => {
         test('produce total from numbers', () => {
             const array = [1, 2, 3, 4, 5];
             const result = sum(array, (i) => i);
-            result.should.equal(15);
+            expect(result).toBe(15);
         });
 
         test('produce total from lengths of arrays', () => {
             const array = [[1, 2], [3], [], [4, 5, 6]];
             const result = sum(array, (i) => i.length);
-            result.should.equal(6);
+            expect(result).toBe(6);
         });
 
         test('produce total of true values from array of booleans', () => {
             const array = [true, false, false, true, true, true, false, true];
             const result = sum(array, (b) => (b ? 1 : 0));
-            result.should.equal(5);
+            expect(result).toBe(5);
         });
     });
 
-    suite('isSubfolderOf', () => {
+    describe('isSubfolderOf', () => {
         test('same paths', () => {
             const subfolder: string = ['C:', 'temp', 'VS', 'dotnetProject'].join(path.sep);
             const folder: string = ['C:', 'temp', 'VS', 'dotnetProject'].join(path.sep);
 
-            expect(isSubfolderOf(subfolder, folder)).to.be.true;
+            expect(isSubfolderOf(subfolder, folder)).toBe(true);
         });
 
         test('correct subfolder', () => {
-            const subfolder: string = ['C:', 'temp', 'VS'].join(path.sep);
-            const folder: string = ['C:', 'temp', 'VS', 'dotnetProject'].join(path.sep);
+            const folder: string = ['C:', 'temp', 'VS'].join(path.sep);
+            const subfolder: string = ['C:', 'temp', 'VS', 'dotnetProject'].join(path.sep);
 
-            expect(isSubfolderOf(subfolder, folder)).to.be.true;
+            expect(isSubfolderOf(subfolder, folder)).toBe(true);
         });
 
-        test('longer subfolder', () => {
-            const subfolder: string = ['C:', 'temp', 'VS', 'a', 'b', 'c'].join(path.sep);
-            const folder: string = ['C:', 'temp', 'VS'].join(path.sep);
+        test('longer folder', () => {
+            const folder: string = ['C:', 'temp', 'VS', 'a', 'b', 'c'].join(path.sep);
+            const subfolder: string = ['C:', 'temp', 'VS'].join(path.sep);
 
-            expect(isSubfolderOf(subfolder, folder)).to.be.false;
+            expect(isSubfolderOf(subfolder, folder)).toBe(false);
         });
 
         test('Different drive', () => {
             const subfolder: string = ['C:', 'temp', 'VS'].join(path.sep);
             const folder: string = ['E:', 'temp', 'VS'].join(path.sep);
 
-            expect(isSubfolderOf(subfolder, folder)).to.be.false;
+            expect(isSubfolderOf(subfolder, folder)).toBe(false);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/fakes/fakeOptions.ts b/omnisharptest/omnisharpUnitTests/fakes/fakeOptions.ts
deleted file mode 100644
index 0c42a9837..000000000
--- a/omnisharptest/omnisharpUnitTests/fakes/fakeOptions.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Options } from '../../../src/shared/options';
-
-export function getEmptyOptions(): Options {
-    return new Options(
-        {
-            dotnetPath: '',
-            waitForDebugger: false,
-            serverPath: '',
-            useOmnisharpServer: true,
-            excludePaths: [],
-            defaultSolution: '',
-            unitTestDebuggingOptions: {},
-        },
-        {
-            useModernNet: false,
-            monoPath: '',
-            loggingLevel: '',
-            autoStart: false,
-            projectFilesExcludePattern: '',
-            projectLoadTimeout: 0,
-            maxProjectResults: 0,
-            useEditorFormattingSettings: false,
-            enableRoslynAnalyzers: false,
-            enableEditorConfigSupport: false,
-            enableDecompilationSupport: false,
-            enableImportCompletion: false,
-            enableAsyncCompletion: false,
-            analyzeOpenDocumentsOnly: false,
-            organizeImportsOnFormat: false,
-            disableMSBuildDiagnosticWarning: false,
-            showOmnisharpLogOnError: false,
-            minFindSymbolsFilterLength: 0,
-            maxFindSymbolsItems: 0,
-            enableMsBuildLoadProjectsOnDemand: false,
-            sdkPath: '',
-            sdkVersion: '',
-            sdkIncludePrereleases: false,
-            testRunSettings: '',
-            dotNetCliPaths: [],
-            useFormatting: false,
-            showReferencesCodeLens: false,
-            showTestsCodeLens: false,
-            filteredSymbolsCodeLens: [],
-            disableCodeActions: false,
-            useSemanticHighlighting: false,
-            inlayHintsEnableForParameters: false,
-            inlayHintsForLiteralParameters: false,
-            inlayHintsForObjectCreationParameters: false,
-            inlayHintsForIndexerParameters: false,
-            inlayHintsForOtherParameters: false,
-            inlayHintsSuppressForParametersThatDifferOnlyBySuffix: false,
-            inlayHintsSuppressForParametersThatMatchMethodIntent: false,
-            inlayHintsSuppressForParametersThatMatchArgumentName: false,
-            inlayHintsEnableForTypes: false,
-            inlayHintsForImplicitVariableTypes: false,
-            inlayHintsForLambdaParameterTypes: false,
-            inlayHintsForImplicitObjectCreation: false,
-            maxProjectFileCountForDiagnosticAnalysis: 1000,
-            suppressDotnetRestoreNotification: false,
-        },
-        {
-            logLevel: '',
-            documentSelector: ['csharp'],
-            extensionsPaths: null,
-        },
-        {
-            razorDevMode: false,
-            razorPluginPath: '',
-        }
-    );
-}
diff --git a/omnisharptest/omnisharpUnitTests/features/reportIssue.test.ts b/omnisharptest/omnisharpUnitTests/features/reportIssue.test.ts
index 018d979e0..13b730615 100644
--- a/omnisharptest/omnisharpUnitTests/features/reportIssue.test.ts
+++ b/omnisharptest/omnisharpUnitTests/features/reportIssue.test.ts
@@ -3,21 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
 import reportIssue from '../../../src/shared/reportIssue';
-import { expect } from 'chai';
-import { vscode } from '../../../src/vscodeAdapter';
-import { Options } from '../../../src/shared/options';
-import { FakeMonoResolver, fakeMonoInfo } from '../fakes/fakeMonoResolver';
-import { FakeDotnetResolver } from '../fakes/fakeDotnetResolver';
+import { FakeMonoResolver, fakeMonoInfo } from '../../omnisharpUnitTests/fakes/fakeMonoResolver';
+import { FakeDotnetResolver } from '../../omnisharpUnitTests/fakes/fakeDotnetResolver';
 import { DotnetInfo } from '../../../src/shared/utils/dotnetInfo';
-import { getEmptyOptions } from '../fakes/fakeOptions';
-import { getFakeVsCode } from '../../../test/unitTests/fakes';
+import { jest, describe, test, expect, beforeEach } from '@jest/globals';
 
-suite(`${reportIssue.name}`, () => {
+describe(`${reportIssue.name}`, () => {
     const vscodeVersion = 'myVersion';
     const csharpExtVersion = 'csharpExtVersion';
     const isValidForMono = true;
-    let vscode: vscode;
     const extension1 = {
         packageJSON: {
             name: 'name1',
@@ -27,7 +23,7 @@ suite(`${reportIssue.name}`, () => {
         },
         id: 'id1',
         extensionPath: 'c:/extensions/abc-x64',
-    };
+    } as vscode.Extension<any>;
 
     const extension2 = {
         packageJSON: {
@@ -38,7 +34,7 @@ suite(`${reportIssue.name}`, () => {
         },
         id: 'id2',
         extensionPath: 'c:/extensions/xyz-x64',
-    };
+    } as vscode.Extension<any>;
 
     const fakeDotnetInfo: DotnetInfo = {
         FullInfo: 'myDotnetInfo',
@@ -50,119 +46,72 @@ suite(`${reportIssue.name}`, () => {
     let fakeMonoResolver: FakeMonoResolver;
     let fakeDotnetResolver: FakeDotnetResolver;
     const getDotnetInfo = async () => Promise.resolve(fakeDotnetInfo);
-    let options: Options;
     let issueBody: string;
 
-    setup(() => {
-        vscode = getFakeVsCode();
-        vscode.commands.executeCommand = async (command: string, ...rest: any[]) => {
+    beforeEach(() => {
+        jest.spyOn(vscode.workspace, 'getConfiguration').mockReturnValue({
+            get: jest.fn((_config: string) => {
+                return undefined;
+            }),
+            has: jest.fn(),
+            inspect: jest.fn(),
+            update: jest.fn(),
+        } as vscode.WorkspaceConfiguration);
+
+        jest.spyOn(vscode.commands, 'executeCommand').mockImplementation(async (command: string, ...rest: any[]) => {
             issueBody = rest[0].issueBody;
-            return undefined;
-        };
+            return {} as any;
+        });
+        jest.replaceProperty(vscode, 'extensions', {
+            all: [extension1, extension2],
+            getExtension: jest.fn(),
+            onDidChange: jest.fn(),
+        } as typeof vscode.extensions);
 
-        vscode.version = vscodeVersion;
-        vscode.extensions.all = [extension1, extension2];
         fakeMonoResolver = new FakeMonoResolver();
         fakeDotnetResolver = new FakeDotnetResolver();
-        options = getEmptyOptions();
     });
 
-    suite('The body is passed to the vscode clipboard and', () => {
+    describe('The body is passed to the vscode clipboard and', () => {
         test('it contains the vscode version', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                isValidForMono,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(issueBody).to.include(`**VSCode version**: ${vscodeVersion}`);
+            await reportIssue(csharpExtVersion, getDotnetInfo, isValidForMono, fakeDotnetResolver, fakeMonoResolver);
+            expect(issueBody).toContain(`**VSCode version**: ${vscodeVersion}`);
         });
 
         test('it contains the csharp extension version', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                isValidForMono,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(issueBody).to.include(`**C# Extension**: ${csharpExtVersion}`);
+            await reportIssue(csharpExtVersion, getDotnetInfo, isValidForMono, fakeDotnetResolver, fakeMonoResolver);
+            expect(issueBody).toContain(`**C# Extension**: ${csharpExtVersion}`);
         });
 
         test('it contains dotnet info', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                isValidForMono,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(issueBody).to.contain(fakeDotnetInfo.FullInfo);
+            await reportIssue(csharpExtVersion, getDotnetInfo, isValidForMono, fakeDotnetResolver, fakeMonoResolver);
+            expect(issueBody).toContain(fakeDotnetInfo.FullInfo);
         });
 
         test('mono information is obtained when it is a valid mono platform', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                isValidForMono,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(fakeMonoResolver.getMonoCalled).to.be.equal(true);
+            await reportIssue(csharpExtVersion, getDotnetInfo, isValidForMono, fakeDotnetResolver, fakeMonoResolver);
+            expect(fakeMonoResolver.getMonoCalled).toEqual(true);
         });
 
         test('mono version is put in the body when it is a valid mono platform', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                isValidForMono,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(fakeMonoResolver.getMonoCalled).to.be.equal(true);
-            expect(issueBody).to.contain(fakeMonoInfo.version);
+            await reportIssue(csharpExtVersion, getDotnetInfo, isValidForMono, fakeDotnetResolver, fakeMonoResolver);
+            expect(fakeMonoResolver.getMonoCalled).toEqual(true);
+            expect(issueBody).toContain(fakeMonoInfo.version);
         });
 
         test('mono information is not obtained when it is not a valid mono platform', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                false,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(fakeMonoResolver.getMonoCalled).to.be.equal(false);
+            await reportIssue(csharpExtVersion, getDotnetInfo, false, fakeDotnetResolver, fakeMonoResolver);
+            expect(fakeMonoResolver.getMonoCalled).toEqual(false);
         });
 
         test('The url contains the name, publisher and version for all the extensions that are not builtin', async () => {
-            await reportIssue(
-                vscode,
-                csharpExtVersion,
-                getDotnetInfo,
-                isValidForMono,
-                options,
-                fakeDotnetResolver,
-                fakeMonoResolver
-            );
-            expect(issueBody).to.contain(extension2.packageJSON.name);
-            expect(issueBody).to.contain(extension2.packageJSON.publisher);
-            expect(issueBody).to.contain(extension2.packageJSON.version);
-            expect(issueBody).to.not.contain(extension1.packageJSON.name);
-            expect(issueBody).to.not.contain(extension1.packageJSON.publisher);
-            expect(issueBody).to.not.contain(extension1.packageJSON.version);
+            await reportIssue(csharpExtVersion, getDotnetInfo, isValidForMono, fakeDotnetResolver, fakeMonoResolver);
+            expect(issueBody).toContain(extension2.packageJSON.name);
+            expect(issueBody).toContain(extension2.packageJSON.publisher);
+            expect(issueBody).toContain(extension2.packageJSON.version);
+            expect(issueBody).not.toContain(extension1.packageJSON.name);
+            expect(issueBody).not.toContain(extension1.packageJSON.publisher);
+            expect(issueBody).not.toContain(extension1.packageJSON.version);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/informationMessageObserver.test.ts b/omnisharptest/omnisharpUnitTests/informationMessageObserver.test.ts
new file mode 100644
index 000000000..52cbfb91f
--- /dev/null
+++ b/omnisharptest/omnisharpUnitTests/informationMessageObserver.test.ts
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { jest, describe, test, expect, beforeEach } from '@jest/globals';
+import { InformationMessageObserver } from '../../src/observers/informationMessageObserver';
+import { getUnresolvedDependenices, getWorkspaceConfiguration } from '../../test/unitTests/fakes';
+import { Subject, from as observableFrom } from 'rxjs';
+import { timeout } from 'rxjs/operators';
+
+describe('InformationMessageObserver', () => {
+    let doClickOk: () => void;
+    let doClickCancel: () => void;
+    let signalCommandDone: () => void;
+    let commandDone: Promise<void> | undefined;
+    const optionObservable = new Subject<void>();
+    let infoMessage: string | undefined;
+    let invokedCommand: string | undefined;
+    const observer: InformationMessageObserver = new InformationMessageObserver(vscode);
+
+    beforeEach(() => {
+        infoMessage = undefined;
+        invokedCommand = undefined;
+        commandDone = new Promise<void>((resolve) => {
+            signalCommandDone = () => {
+                resolve();
+            };
+        });
+
+        jest.spyOn(vscode.workspace, 'getConfiguration').mockReturnValue(getWorkspaceConfiguration());
+        jest.spyOn(vscode.window, 'showInformationMessage').mockImplementation(
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            //@ts-ignore
+            async <T>(message: string, ...items: T[]) => {
+                infoMessage = message;
+                return new Promise<T | undefined>((resolve) => {
+                    doClickCancel = () => {
+                        resolve(undefined);
+                    };
+
+                    doClickOk = () => {
+                        resolve(items[0]);
+                    };
+
+                    return undefined;
+                });
+            }
+        );
+        jest.spyOn(vscode.commands, 'executeCommand').mockImplementation(async (command: string, ..._: any[]) => {
+            invokedCommand = command;
+            signalCommandDone();
+            return undefined;
+        });
+    });
+
+    [
+        {
+            event: getUnresolvedDependenices('someFile'),
+            expectedCommand: 'dotnet.restore.all',
+        },
+    ].forEach((elem) => {
+        describe(elem.event.constructor.name, () => {
+            describe('Suppress Dotnet Restore Notification is true', () => {
+                beforeEach(() => {
+                    vscode.workspace.getConfiguration().update('csharp.suppressDotnetRestoreNotification', true);
+                    optionObservable.next();
+                });
+
+                test('The information message is not shown', () => {
+                    observer.post(elem.event);
+                    expect(infoMessage).toBeUndefined();
+                });
+            });
+
+            describe('Suppress Dotnet Restore Notification is false', () => {
+                beforeEach(() => {
+                    vscode.workspace.getConfiguration().update('csharp.suppressDotnetRestoreNotification', false);
+                    optionObservable.next();
+                });
+
+                test('The information message is shown', async () => {
+                    observer.post(elem.event);
+                    expect(infoMessage?.length).toBeGreaterThan(0);
+                    doClickOk();
+                    await commandDone;
+                    expect(invokedCommand).toEqual(elem.expectedCommand);
+                });
+
+                test('Given an information message if the user clicks Restore, the command is executed', async () => {
+                    observer.post(elem.event);
+                    doClickOk();
+                    await commandDone;
+                    expect(invokedCommand).toEqual(elem.expectedCommand);
+                });
+
+                test('Given an information message if the user clicks cancel, the command is not executed', async () => {
+                    observer.post(elem.event);
+                    doClickCancel();
+                    await expect(observableFrom(commandDone!).pipe(timeout(1)).toPromise()).rejects.toThrow();
+                    expect(invokedCommand).toBeUndefined();
+                });
+            });
+        });
+    });
+
+    afterEach(() => {
+        commandDone = undefined;
+    });
+});
diff --git a/omnisharptest/omnisharpUnitTests/installRuntimeDependencies.test.ts b/omnisharptest/omnisharpUnitTests/installRuntimeDependencies.test.ts
index 853f04053..55409e471 100644
--- a/omnisharptest/omnisharpUnitTests/installRuntimeDependencies.test.ts
+++ b/omnisharptest/omnisharpUnitTests/installRuntimeDependencies.test.ts
@@ -3,19 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { installRuntimeDependencies } from '../../src/installRuntimeDependencies';
 import IInstallDependencies from '../../src/packageManager/IInstallDependencies';
 import { EventStream } from '../../src/eventStream';
 import { PlatformInformation } from '../../src/shared/platform';
-import * as chai from 'chai';
-import TestEventBus from './testAssets/testEventBus';
+import TestEventBus from '../omnisharpUnitTests/testAssets/testEventBus';
 import { AbsolutePathPackage } from '../../src/packageManager/absolutePathPackage';
 import { Package } from '../../src/packageManager/package';
 import { isNotNull } from '../testUtil';
 
-const expect = chai.expect;
-
-suite(`${installRuntimeDependencies.name}`, () => {
+describe(`${installRuntimeDependencies.name}`, () => {
     let packageJSON = {
         runtimeDependencies: [] as Package[],
     };
@@ -27,14 +25,14 @@ suite(`${installRuntimeDependencies.name}`, () => {
     const platformInfo = new PlatformInformation('linux', 'architecture1');
     const useFramework = true;
 
-    setup(() => {
+    beforeEach(() => {
         eventStream = new EventStream();
         eventBus = new TestEventBus(eventStream);
         installDependencies = async () => Promise.resolve(true);
     });
 
-    suite('When all the dependencies already exist', () => {
-        suiteSetup(() => {
+    describe('When all the dependencies already exist', () => {
+        beforeEach(() => {
             packageJSON = {
                 runtimeDependencies: [],
             };
@@ -50,7 +48,7 @@ suite(`${installRuntimeDependencies.name}`, () => {
                 useFramework,
                 ['Debugger', 'Omnisharp', 'Razor']
             );
-            expect(installed).to.be.true;
+            expect(installed).toBe(true);
         });
 
         test("Doesn't log anything to the eventStream", async () => {
@@ -67,11 +65,11 @@ suite(`${installRuntimeDependencies.name}`, () => {
                 useFramework,
                 ['Debugger', 'Omnisharp', 'Razor']
             );
-            expect(eventBus.getEvents()).to.be.empty;
+            expect(eventBus.getEvents()).toHaveLength(0);
         });
     });
 
-    suite('When there is a dependency to install', () => {
+    describe('When there is a dependency to install', () => {
         const packageToInstall: Package = {
             id: 'myPackage',
             description: 'somePackage',
@@ -82,7 +80,7 @@ suite(`${installRuntimeDependencies.name}`, () => {
             architectures: [platformInfo.architecture],
         };
 
-        setup(() => {
+        beforeEach(() => {
             packageJSON = {
                 runtimeDependencies: [packageToInstall],
             };
@@ -104,10 +102,10 @@ suite(`${installRuntimeDependencies.name}`, () => {
                 useFramework,
                 ['myPackage']
             );
-            expect(installed).to.be.true;
+            expect(installed).toBe(true);
             isNotNull(inputPackage!);
-            expect(inputPackage).to.have.length(1);
-            expect(inputPackage[0]).to.be.deep.equal(
+            expect(inputPackage).toHaveLength(1);
+            expect(inputPackage[0]).toStrictEqual(
                 AbsolutePathPackage.getAbsolutePathPackage(packageToInstall, extensionPath)
             );
         });
@@ -123,7 +121,7 @@ suite(`${installRuntimeDependencies.name}`, () => {
                 useFramework,
                 ['myPackage']
             );
-            expect(installed).to.be.false;
+            expect(installed).toBe(false);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/jest.config.ts b/omnisharptest/omnisharpUnitTests/jest.config.ts
new file mode 100644
index 000000000..b913f9a25
--- /dev/null
+++ b/omnisharptest/omnisharpUnitTests/jest.config.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const jestOmniSharpUnitTestProjectName = 'OmniSharp Unit Tests';
+
+/**
+ * Defines a jest project configuration for O# jest tests.
+ */
+const omnisharpConfig: Config = {
+    ...baseProjectConfig,
+    displayName: jestOmniSharpUnitTestProjectName,
+    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
+    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
+    modulePathIgnorePatterns: ['out'],
+    // Specify jest to only run tests in jest folders.
+    // We also have to include the __mocks__ folder.  That folder must be next to node_modules so we can't move it,
+    // but if we specify roots, jest won't automatically pick it up.  So we have to specify it here.
+    roots: ['<rootDir>', '<rootDir>/../../__mocks__'],
+};
+
+export default omnisharpConfig;
diff --git a/omnisharptest/omnisharpUnitTests/logging/backgroundWorkStatusBarObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/backgroundWorkStatusBarObserver.test.ts
index 4927a47aa..a30c7c0ab 100644
--- a/omnisharptest/omnisharpUnitTests/logging/backgroundWorkStatusBarObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/backgroundWorkStatusBarObserver.test.ts
@@ -3,15 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { expect, should } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { StatusBarItem } from '../../../src/vscodeAdapter';
 import { OmnisharpBackgroundDiagnosticStatus } from '../../../src/omnisharp/loggingEvents';
 import { BackgroundWorkStatusBarObserver } from '../../../src/observers/backgroundWorkStatusBarObserver';
 import { BackgroundDiagnosticStatus } from '../../../src/omnisharp/protocol';
 
-suite('BackgroundWorkStatusBarObserver', () => {
-    suiteSetup(() => should());
-
+describe('BackgroundWorkStatusBarObserver', () => {
     let showCalled: boolean;
     let hideCalled: boolean;
     const statusBarItem = <StatusBarItem>{
@@ -24,7 +22,7 @@ suite('BackgroundWorkStatusBarObserver', () => {
     };
     const observer = new BackgroundWorkStatusBarObserver(statusBarItem);
 
-    setup(() => {
+    beforeEach(() => {
         showCalled = false;
         hideCalled = false;
     });
@@ -37,9 +35,9 @@ suite('BackgroundWorkStatusBarObserver', () => {
             NumberProjects: 0,
         });
         observer.post(event);
-        expect(hideCalled).to.be.false;
-        expect(showCalled).to.be.true;
-        expect(statusBarItem.text).to.contain('Analyzing');
+        expect(hideCalled).toBe(false);
+        expect(showCalled).toBe(true);
+        expect(statusBarItem.text).toContain('Analyzing');
     });
 
     test('OmnisharpBackgroundDiagnosticStatus.Ready: Hide processing message', () => {
@@ -50,8 +48,8 @@ suite('BackgroundWorkStatusBarObserver', () => {
             NumberProjects: 0,
         });
         observer.post(event);
-        expect(hideCalled).to.be.true;
-        expect(showCalled).to.be.false;
-        expect(statusBarItem.text).to.be.equal('');
+        expect(hideCalled).toBe(true);
+        expect(showCalled).toBe(false);
+        expect(statusBarItem.text).toEqual('');
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/csharpChannelObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/csharpChannelObserver.test.ts
index aafae2126..5c8291098 100644
--- a/omnisharptest/omnisharpUnitTests/logging/csharpChannelObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/csharpChannelObserver.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should, expect } from 'chai';
+import { describe, test, expect } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import { CsharpChannelObserver } from '../../../src/shared/observers/csharpChannelObserver';
 import {
@@ -16,8 +16,7 @@ import {
     IntegrityCheckFailure,
 } from '../../../src/omnisharp/loggingEvents';
 
-suite('CsharpChannelObserver', () => {
-    suiteSetup(() => should());
+describe('CsharpChannelObserver', () => {
     [
         new InstallationFailure('someStage', 'someError'),
         new DebuggerNotInstalledFailure(),
@@ -38,8 +37,8 @@ suite('CsharpChannelObserver', () => {
             });
 
             observer.post(event);
-            expect(hasShown).to.be.true;
-            expect(preserveFocus).to.be.true;
+            expect(hasShown).toBe(true);
+            expect(preserveFocus).toBe(true);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/csharpLoggerObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/csharpLoggerObserver.test.ts
index 87af2f3ad..b09c42649 100644
--- a/omnisharptest/omnisharpUnitTests/logging/csharpLoggerObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/csharpLoggerObserver.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should, expect } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import { CsharpLoggerObserver } from '../../../src/shared/observers/csharpLoggerObserver';
 import { PlatformInformation } from '../../../src/shared/platform';
@@ -11,9 +11,7 @@ import * as Event from '../../../src/omnisharp/loggingEvents';
 import { PackageError } from '../../../src/packageManager/packageError';
 import { Package } from '../../../src/packageManager/package';
 
-suite('CsharpLoggerObserver', () => {
-    suiteSetup(() => should());
-
+describe('CsharpLoggerObserver', () => {
     let logOutput = '';
     const observer = new CsharpLoggerObserver({
         ...getNullChannel(),
@@ -29,30 +27,30 @@ suite('CsharpLoggerObserver', () => {
         architectures: [],
     };
 
-    setup(() => {
+    beforeEach(() => {
         logOutput = '';
     });
 
     test('PlatformInfo: Logs contain the Platform and Architecture', () => {
         const event = new Event.LogPlatformInfo(new PlatformInformation('linux', 'MyArchitecture'));
         observer.post(event);
-        expect(logOutput).to.contain('linux');
-        expect(logOutput).to.contain('MyArchitecture');
+        expect(logOutput).toContain('linux');
+        expect(logOutput).toContain('MyArchitecture');
     });
 
-    suite('InstallationFailure', () => {
+    describe('InstallationFailure', () => {
         test('Stage and Error is logged if not a PackageError', () => {
             const event = new Event.InstallationFailure('someStage', new Error('someError'));
             observer.post(event);
-            expect(logOutput).to.contain(event.stage);
-            expect(logOutput).to.contain(event.error.toString());
+            expect(logOutput).toContain(event.stage);
+            expect(logOutput).toContain(event.error.toString());
         });
 
         test('Stage and Error is logged if a PackageError without inner error', () => {
             const event = new Event.InstallationFailure('someStage', new PackageError('someError', pkg, undefined));
             observer.post(event);
-            expect(logOutput).to.contain(event.stage);
-            expect(logOutput).to.contain(event.error.message);
+            expect(logOutput).toContain(event.stage);
+            expect(logOutput).toContain(event.error.message);
         });
 
         test('Stage and Inner error is logged if a PackageError without inner error', () => {
@@ -61,12 +59,12 @@ suite('CsharpLoggerObserver', () => {
                 new PackageError('someError', pkg, new Error('innerError'))
             );
             observer.post(event);
-            expect(logOutput).to.contain(event.stage);
-            expect(logOutput).to.contain(event.error.innerError.toString());
+            expect(logOutput).toContain(event.stage);
+            expect(logOutput).toContain(event.error.innerError.toString());
         });
     });
 
-    suite('Download', () => {
+    describe('Download', () => {
         const packageName = 'somePackage';
         [
             {
@@ -155,7 +153,7 @@ suite('CsharpLoggerObserver', () => {
                 });
 
                 element.events.forEach((message: Event.BaseEvent) => observer.post(message));
-                expect(logOutput).to.be.equal(element.expected);
+                expect(logOutput).toEqual(element.expected);
             });
         });
     });
@@ -172,44 +170,44 @@ suite('CsharpLoggerObserver', () => {
     ].forEach((element) =>
         test(`${element.message.constructor.name} is shown`, () => {
             observer.post(element.message);
-            expect(logOutput).to.contain(element.expected);
+            expect(logOutput).toContain(element.expected);
         })
     );
 
     test(`ActivationFailure: Some message is logged`, () => {
         const event = new Event.ActivationFailure();
         observer.post(event);
-        expect(logOutput).to.not.be.empty;
+        expect(logOutput).toBeTruthy();
     });
 
     test(`ProjectJsonDeprecatedWarning: Some message is logged`, () => {
         const event = new Event.ProjectJsonDeprecatedWarning();
         observer.post(event);
-        expect(logOutput).to.not.be.empty;
+        expect(logOutput).toBeTruthy();
     });
 
     test(`InstallationSuccess: Some message is logged`, () => {
         const event = new Event.InstallationSuccess();
         observer.post(event);
-        expect(logOutput).to.not.be.empty;
+        expect(logOutput).toBeTruthy();
     });
 
     test(`InstallationProgress: Progress message is logged`, () => {
         const event = new Event.InstallationStart('somPackage');
         observer.post(event);
-        expect(logOutput).to.contain(event.packageDescription);
+        expect(logOutput).toContain(event.packageDescription);
     });
 
     test('PackageInstallation: Package name is logged', () => {
         const event = new Event.PackageInstallation('somePackage');
         observer.post(event);
-        expect(logOutput).to.contain(event.packageInfo);
+        expect(logOutput).toContain(event.packageInfo);
     });
 
     test('DownloadFallBack: The fallbackurl is logged', () => {
         const event = new Event.DownloadFallBack('somrurl');
         observer.post(event);
-        expect(logOutput).to.contain(event.fallbackUrl);
+        expect(logOutput).toContain(event.fallbackUrl);
     });
 
     test(`${Event.IntegrityCheckFailure.name}: Package Description is logged when we are retrying`, () => {
@@ -217,7 +215,7 @@ suite('CsharpLoggerObserver', () => {
         const url = 'someUrl';
         const event = new Event.IntegrityCheckFailure(description, url, true);
         observer.post(event);
-        expect(logOutput).to.contain(description);
+        expect(logOutput).toContain(description);
     });
 
     test(`${Event.IntegrityCheckFailure.name}: Package Description and url are logged when we are not retrying`, () => {
@@ -225,13 +223,13 @@ suite('CsharpLoggerObserver', () => {
         const url = 'someUrl';
         const event = new Event.IntegrityCheckFailure(description, url, false);
         observer.post(event);
-        expect(logOutput).to.contain(description);
-        expect(logOutput).to.contain(url);
+        expect(logOutput).toContain(description);
+        expect(logOutput).toContain(url);
     });
 
     test(`${Event.IntegrityCheckSuccess.name}: Some message is logged`, () => {
         const event = new Event.IntegrityCheckSuccess();
         observer.post(event);
-        expect(logOutput).to.not.be.empty;
+        expect(logOutput).toBeTruthy();
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/dotnetChannelObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/dotnetChannelObserver.test.ts
index 17fb26210..88b7b569d 100644
--- a/omnisharptest/omnisharpUnitTests/logging/dotnetChannelObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/dotnetChannelObserver.test.ts
@@ -3,13 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should, expect } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { DotNetChannelObserver } from '../../../src/observers/dotnetChannelObserver';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import { CommandDotNetRestoreStart } from '../../../src/omnisharp/loggingEvents';
 
-suite('DotnetChannelObserver', () => {
-    suiteSetup(() => should());
+describe('DotnetChannelObserver', () => {
     let hasShown: boolean;
     let hasCleared: boolean;
 
@@ -23,7 +22,7 @@ suite('DotnetChannelObserver', () => {
         },
     });
 
-    setup(() => {
+    beforeEach(() => {
         hasShown = false;
         hasCleared = false;
     });
@@ -31,7 +30,7 @@ suite('DotnetChannelObserver', () => {
     test(`CommandDotNetRestoreStart : Clears and shows the channel`, () => {
         const event = new CommandDotNetRestoreStart();
         observer.post(event);
-        expect(hasCleared).to.be.true;
-        expect(hasShown).to.be.true;
+        expect(hasCleared).toBe(true);
+        expect(hasShown).toBe(true);
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/dotnetLoggerObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/dotnetLoggerObserver.test.ts
index 03f2a7b42..529c9d1f1 100644
--- a/omnisharptest/omnisharpUnitTests/logging/dotnetLoggerObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/dotnetLoggerObserver.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should, expect } from 'chai';
+import { describe, test, expect } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import { DotnetLoggerObserver } from '../../../src/observers/dotnetLoggerObserver';
 import {
@@ -13,9 +13,7 @@ import {
     EventWithMessage,
 } from '../../../src/omnisharp/loggingEvents';
 
-suite('DotnetLoggerObserver', () => {
-    suiteSetup(() => should());
-
+describe('DotnetLoggerObserver', () => {
     [
         new CommandDotNetRestoreProgress('Some message'),
         new CommandDotNetRestoreSucceeded('Some message'),
@@ -31,7 +29,7 @@ suite('DotnetLoggerObserver', () => {
             });
 
             observer.post(event);
-            expect(appendedMessage).to.contain(event.message);
+            expect(appendedMessage).toContain(event.message);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/dotnetTestChannelObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/dotnetTestChannelObserver.test.ts
index 5e510d067..ed0a47348 100644
--- a/omnisharptest/omnisharpUnitTests/logging/dotnetTestChannelObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/dotnetTestChannelObserver.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { expect } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import {
     BaseEvent,
@@ -15,7 +15,7 @@ import {
 } from '../../../src/omnisharp/loggingEvents';
 import DotnetTestChannelObserver from '../../../src/observers/dotnetTestChannelObserver';
 
-suite('DotnetTestChannelObserver', () => {
+describe('DotnetTestChannelObserver', () => {
     let hasShown: boolean;
     let preserveFocus: boolean;
 
@@ -27,7 +27,7 @@ suite('DotnetTestChannelObserver', () => {
         },
     });
 
-    setup(() => {
+    beforeEach(() => {
         hasShown = false;
     });
 
@@ -39,10 +39,10 @@ suite('DotnetTestChannelObserver', () => {
         new DotNetTestsInClassDebugStart('someclass'),
     ].forEach((event: BaseEvent) => {
         test(`${event.constructor.name}: Channel is shown and preserve focus is set to true`, () => {
-            expect(hasShown).to.be.false;
+            expect(hasShown).toBe(false);
             observer.post(event);
-            expect(hasShown).to.be.true;
-            expect(preserveFocus).to.be.true;
+            expect(hasShown).toBe(true);
+            expect(preserveFocus).toBe(true);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/dotnetTestLoggerObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/dotnetTestLoggerObserver.test.ts
index 81b9d2432..a5b74ae40 100644
--- a/omnisharptest/omnisharpUnitTests/logging/dotnetTestLoggerObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/dotnetTestLoggerObserver.test.ts
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as chai from 'chai';
-import * as chaiString from 'chai-string';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import {
     EventWithMessage,
@@ -24,10 +23,7 @@ import {
 import DotNetTestLoggerObserver from '../../../src/observers/dotnetTestLoggerObserver';
 import * as protocol from '../../../src/omnisharp/protocol';
 
-const expect = chai.expect;
-chai.use(chaiString);
-
-suite(`${DotNetTestLoggerObserver.name}`, () => {
+describe(`${DotNetTestLoggerObserver.name}`, () => {
     let appendedMessage: string;
     const observer = new DotNetTestLoggerObserver({
         ...getNullChannel(),
@@ -36,7 +32,7 @@ suite(`${DotNetTestLoggerObserver.name}`, () => {
         },
     });
 
-    setup(() => {
+    beforeEach(() => {
         appendedMessage = '';
     });
 
@@ -44,33 +40,35 @@ suite(`${DotNetTestLoggerObserver.name}`, () => {
         (event: EventWithMessage) => {
             test(`${event.constructor.name}: Message is logged`, () => {
                 observer.post(event);
-                expect(appendedMessage).to.contain(event.message);
+                expect(appendedMessage).toContain(event.message);
             });
         }
     );
 
     [new DotNetTestDebugStart('foo'), new DotNetTestRunStart('foo')].forEach((event: BaseEvent) => {
         test(`${event.constructor.name}: Test method is logged`, () => {
-            expect(appendedMessage).to.be.empty;
+            expect(appendedMessage).toBeFalsy();
             observer.post(event);
-            expect(appendedMessage).to.contain('foo');
+            expect(appendedMessage).toContain('foo');
         });
     });
 
     [new DotNetTestsInClassDebugStart('foo'), new DotNetTestsInClassRunStart('foo')].forEach((event: BaseEvent) => {
         test(`${event.constructor.name}: Class name is logged`, () => {
-            expect(appendedMessage).to.be.empty;
+            expect(appendedMessage).toBeFalsy();
             observer.post(event);
-            expect(appendedMessage).to.contain('foo');
+            expect(appendedMessage).toContain('foo');
         });
     });
 
     [new DotNetTestRunInContextStart('foo', 1, 2), new DotNetTestDebugInContextStart('foo', 1, 2)].forEach(
         (event: BaseEvent) => {
             test(`${event.constructor.name}: File name and line/column are logged`, () => {
-                expect(appendedMessage).to.be.empty;
+                expect(appendedMessage).toBeFalsy;
                 observer.post(event);
-                expect(appendedMessage).to.contain('foo').and.contain('2').and.contain('3');
+                expect(appendedMessage).toContain('foo');
+                expect(appendedMessage).toContain('2');
+                expect(appendedMessage).toContain('3');
             });
         }
     );
@@ -78,16 +76,16 @@ suite(`${DotNetTestLoggerObserver.name}`, () => {
     test(`${DotNetTestDebugProcessStart.name}: Target process id is logged`, () => {
         const event = new DotNetTestDebugProcessStart(111);
         observer.post(event);
-        expect(appendedMessage).to.contain(event.targetProcessId);
+        expect(appendedMessage).toContain(event.targetProcessId.toString());
     });
 
     test(`${DotNetTestDebugComplete.name}: Message is logged`, () => {
         const event = new DotNetTestDebugComplete();
         observer.post(event);
-        expect(appendedMessage).to.not.be.empty;
+        expect(appendedMessage).toBeTruthy();
     });
 
-    suite(`${ReportDotNetTestResults.name}`, () => {
+    describe(`${ReportDotNetTestResults.name}`, () => {
         const event = new ReportDotNetTestResults([
             getDotNetTestResults(
                 'foo',
@@ -105,21 +103,23 @@ suite(`${DotNetTestLoggerObserver.name}`, () => {
         test(`Displays the outcome of each test`, () => {
             observer.post(event);
             event.results!.forEach((result) => {
-                expect(appendedMessage).to.containIgnoreCase(`${result.MethodName}:\n    Outcome: ${result.Outcome}`);
+                expect(appendedMessage.toUpperCase()).toContain(
+                    `${result.MethodName}:\n    Outcome: ${result.Outcome}`.toUpperCase()
+                );
             });
         });
 
         test(`Displays the total outcome`, () => {
             observer.post(event);
-            expect(appendedMessage).to.contain(`Total tests: 4. Passed: 1. Failed: 2. Skipped: 1`);
+            expect(appendedMessage).toContain(`Total tests: 4. Passed: 1. Failed: 2. Skipped: 1`);
         });
 
         test('Displays the error message and error stack trace if any is present', () => {
             observer.post(event);
-            expect(appendedMessage).to.contain(
+            expect(appendedMessage).toContain(
                 'foo:\n    Outcome: Failed\n    Error Message:\n    assertion failed\n    Stack Trace:\n    stacktrace1'
             );
-            expect(appendedMessage).to.contain(
+            expect(appendedMessage).toContain(
                 'failinator:\n    Outcome: Failed\n    Error Message:\n    error occurred\n    Stack Trace:\n    stacktrace2'
             );
         });
@@ -127,20 +127,20 @@ suite(`${DotNetTestLoggerObserver.name}`, () => {
         test(`Displays the standard output messages if any`, () => {
             observer.post(event);
             event.results!.forEach((result) => {
-                result.StandardOutput.forEach((message) => expect(appendedMessage).to.contain(message));
+                result.StandardOutput.forEach((message) => expect(appendedMessage).toContain(message));
             });
         });
 
         test(`Displays the standard error messages if any`, () => {
             observer.post(event);
             event.results!.forEach((result) => {
-                result.StandardError.forEach((message) => expect(appendedMessage).to.contain(message));
+                result.StandardError.forEach((message) => expect(appendedMessage).toContain(message));
             });
         });
 
         test(`Can handle malformed results`, () => {
             observer.post(new ReportDotNetTestResults([]));
-            expect(appendedMessage).to.contain(
+            expect(appendedMessage).toContain(
                 '----- Test Execution Summary -----\n\nTotal tests: 0. Passed: 0. Failed: 0. Skipped: 0'
             );
         });
diff --git a/omnisharptest/omnisharpUnitTests/logging/errorMessageObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/errorMessageObserver.test.ts
index f1bcd1c0e..be5566621 100644
--- a/omnisharptest/omnisharpUnitTests/logging/errorMessageObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/errorMessageObserver.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { expect, should } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { vscode } from '../../../src/vscodeAdapter';
 
 import { ErrorMessageObserver } from '../../../src/observers/errorMessageObserver';
@@ -16,9 +16,7 @@ import {
 } from '../../../src/omnisharp/loggingEvents';
 import { getFakeVsCode } from '../../../test/unitTests/fakes';
 
-suite('ErrorMessageObserver', () => {
-    suiteSetup(() => should());
-
+describe('ErrorMessageObserver', () => {
     const vscode: vscode = getFakeVsCode();
     let errorMessage: string | undefined;
     const observer = new ErrorMessageObserver(vscode);
@@ -28,7 +26,7 @@ suite('ErrorMessageObserver', () => {
         return Promise.resolve<string>('Done');
     };
 
-    setup(() => {
+    beforeEach(() => {
         errorMessage = undefined;
     });
 
@@ -39,18 +37,18 @@ suite('ErrorMessageObserver', () => {
     ].forEach((event: EventWithMessage) => {
         test(`${event.constructor.name}: Error message is shown`, () => {
             observer.post(event);
-            expect(errorMessage).to.be.contain(event.message);
+            expect(errorMessage).toContain(event.message);
         });
     });
 
-    suite(`${IntegrityCheckFailure.name}`, () => {
+    describe(`${IntegrityCheckFailure.name}`, () => {
         test('Package Description and url are logged when we are not retrying', () => {
             const description = 'someDescription';
             const url = 'someUrl';
             const event = new IntegrityCheckFailure(description, url, false);
             observer.post(event);
-            expect(errorMessage).to.contain(description);
-            expect(errorMessage).to.contain(url);
+            expect(errorMessage).toContain(description);
+            expect(errorMessage).toContain(url);
         });
 
         test('Nothing is shown if we are retrying', () => {
@@ -58,7 +56,7 @@ suite('ErrorMessageObserver', () => {
             const url = 'someUrl';
             const event = new IntegrityCheckFailure(description, url, true);
             observer.post(event);
-            expect(errorMessage).to.be.undefined;
+            expect(errorMessage).toBe(undefined);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/informationMessageObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/informationMessageObserver.test.ts
deleted file mode 100644
index 76f9f45b5..000000000
--- a/omnisharptest/omnisharpUnitTests/logging/informationMessageObserver.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { InformationMessageObserver } from '../../../src/observers/informationMessageObserver';
-import OptionProvider from '../../../src/shared/observers/optionProvider';
-import { expect, should } from 'chai';
-import { getUnresolvedDependenices, updateConfig, getVSCodeWithConfig } from '../../../test/unitTests/fakes';
-import { Subject, from as observableFrom } from 'rxjs';
-import { timeout } from 'rxjs/operators';
-import { Options } from '../../../src/shared/options';
-
-suite('InformationMessageObserver', () => {
-    suiteSetup(() => should());
-
-    let doClickOk: () => void;
-    let doClickCancel: () => void;
-    let signalCommandDone: () => void;
-    let commandDone: Promise<void> | undefined;
-    const vscode = getVsCode();
-    const optionObservable = new Subject<Options>();
-    const optionProvider = new OptionProvider(optionObservable);
-    let infoMessage: string | undefined;
-    let invokedCommand: string | undefined;
-    const observer: InformationMessageObserver = new InformationMessageObserver(vscode, optionProvider);
-
-    setup(() => {
-        infoMessage = undefined;
-        invokedCommand = undefined;
-        commandDone = new Promise<void>((resolve) => {
-            signalCommandDone = () => {
-                resolve();
-            };
-        });
-    });
-
-    [
-        {
-            event: getUnresolvedDependenices('someFile'),
-            expectedCommand: 'dotnet.restore.all',
-        },
-    ].forEach((elem) => {
-        suite(elem.event.constructor.name, () => {
-            suite('Suppress Dotnet Restore Notification is true', () => {
-                setup(() => {
-                    updateConfig(vscode, 'csharp', 'suppressDotnetRestoreNotification', true);
-                    optionObservable.next(Options.Read(vscode));
-                });
-
-                test('The information message is not shown', () => {
-                    observer.post(elem.event);
-                    expect(infoMessage).to.be.undefined;
-                });
-            });
-
-            suite('Suppress Dotnet Restore Notification is false', () => {
-                setup(() => {
-                    updateConfig(vscode, 'csharp', 'suppressDotnetRestoreNotification', false);
-                    optionObservable.next(Options.Read(vscode));
-                });
-
-                test('The information message is shown', async () => {
-                    observer.post(elem.event);
-                    expect(infoMessage).to.not.be.empty;
-                    doClickOk();
-                    await commandDone;
-                    expect(invokedCommand).to.be.equal(elem.expectedCommand);
-                });
-
-                test('Given an information message if the user clicks Restore, the command is executed', async () => {
-                    observer.post(elem.event);
-                    doClickOk();
-                    await commandDone;
-                    expect(invokedCommand).to.be.equal(elem.expectedCommand);
-                });
-
-                test('Given an information message if the user clicks cancel, the command is not executed', async () => {
-                    observer.post(elem.event);
-                    doClickCancel();
-                    await expect(observableFrom(commandDone!).pipe(timeout(1)).toPromise()).to.be.rejected;
-                    expect(invokedCommand).to.be.undefined;
-                });
-            });
-        });
-    });
-
-    teardown(() => {
-        commandDone = undefined;
-    });
-
-    function getVsCode() {
-        const vscode = getVSCodeWithConfig();
-        vscode.window.showInformationMessage = async <T>(message: string, ...items: T[]) => {
-            infoMessage = message;
-            return new Promise<T | undefined>((resolve) => {
-                doClickCancel = () => {
-                    resolve(undefined);
-                };
-
-                doClickOk = () => {
-                    resolve(items[0]);
-                };
-            });
-        };
-
-        vscode.commands.executeCommand = async (command: string, ..._: any[]) => {
-            invokedCommand = command;
-            signalCommandDone();
-            return undefined;
-        };
-
-        return vscode;
-    }
-});
diff --git a/omnisharptest/omnisharpUnitTests/logging/omnisharpChannelObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/omnisharpChannelObserver.test.ts
index c09f615b7..3a88349ca 100644
--- a/omnisharptest/omnisharpUnitTests/logging/omnisharpChannelObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/omnisharpChannelObserver.test.ts
@@ -2,9 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { expect } from 'chai';
-import { vscode } from '../../../src/vscodeAdapter';
-import { getNullChannel, updateConfig, getVSCodeWithConfig } from '../../../test/unitTests/fakes';
+
+import * as vscode from 'vscode';
+import { jest, describe, test, expect, beforeEach } from '@jest/globals';
+import { getNullChannel, getWorkspaceConfiguration } from '../../../test/unitTests/fakes';
 import { OmnisharpChannelObserver } from '../../../src/observers/omnisharpChannelObserver';
 import {
     OmnisharpFailure,
@@ -13,40 +14,34 @@ import {
     OmnisharpRestart,
     OmnisharpServerOnStdErr,
 } from '../../../src/omnisharp/loggingEvents';
-import OptionProvider from '../../../src/shared/observers/optionProvider';
 import { Subject } from 'rxjs';
-import { Options } from '../../../src/shared/options';
 
-suite('OmnisharpChannelObserver', () => {
+describe('OmnisharpChannelObserver', () => {
     let hasShown: boolean;
     let hasCleared: boolean;
     let preserveFocus: boolean | undefined;
-    let vscode: vscode;
-    const optionObservable = new Subject<Options>();
-    const optionProvider = new OptionProvider(optionObservable);
+    const optionObservable = new Subject<void>();
     let observer: OmnisharpChannelObserver;
 
-    setup(() => {
+    beforeEach(() => {
         hasShown = false;
         hasCleared = false;
         preserveFocus = false;
-        vscode = getVSCodeWithConfig();
-        observer = new OmnisharpChannelObserver(
-            {
-                ...getNullChannel(),
-                show: (preserve) => {
-                    hasShown = true;
-                    preserveFocus = preserve;
-                },
-                clear: () => {
-                    hasCleared = true;
-                },
+        observer = new OmnisharpChannelObserver({
+            ...getNullChannel(),
+            show: (preserve) => {
+                hasShown = true;
+                preserveFocus = preserve;
+            },
+            clear: () => {
+                hasCleared = true;
             },
-            optionProvider
-        );
+        });
+
+        jest.spyOn(vscode.workspace, 'getConfiguration').mockReturnValue(getWorkspaceConfiguration());
 
-        updateConfig(vscode, 'csharp', 'showOmnisharpLogOnError', true);
-        optionObservable.next(Options.Read(vscode));
+        vscode.workspace.getConfiguration().update('csharp.showOmnisharpLogOnError', true);
+        optionObservable.next();
     });
 
     [
@@ -55,28 +50,28 @@ suite('OmnisharpChannelObserver', () => {
         new OmnisharpServerOnStdErr('std err'),
     ].forEach((event: BaseEvent) => {
         test(`${event.constructor.name}: Channel is shown and preserveFocus is set to true`, () => {
-            expect(hasShown).to.be.false;
+            expect(hasShown).toEqual(false);
             observer.post(event);
-            expect(hasShown).to.be.true;
-            expect(preserveFocus).to.be.true;
+            expect(hasShown).toEqual(true);
+            expect(preserveFocus).toEqual(true);
         });
     });
 
     test(`OmnisharpServerOnStdErr: Channel is not shown when disabled in configuration`, () => {
-        updateConfig(vscode, 'csharp', 'showOmnisharpLogOnError', false);
-        optionObservable.next(Options.Read(vscode));
+        vscode.workspace.getConfiguration().update('csharp.showOmnisharpLogOnError', false);
+        optionObservable.next();
 
-        expect(hasShown).to.be.false;
+        expect(hasShown).toEqual(false);
         observer.post(new OmnisharpServerOnStdErr('std err'));
-        expect(hasShown).to.be.false;
-        expect(preserveFocus).to.be.false;
+        expect(hasShown).toEqual(false);
+        expect(preserveFocus).toEqual(false);
     });
 
     [new OmnisharpRestart()].forEach((event: BaseEvent) => {
         test(`${event.constructor.name}: Channel is cleared`, () => {
-            expect(hasCleared).to.be.false;
+            expect(hasCleared).toEqual(false);
             observer.post(event);
-            expect(hasCleared).to.be.true;
+            expect(hasCleared).toEqual(true);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/omnisharpDebugModeLoggerObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/omnisharpDebugModeLoggerObserver.test.ts
index de2c5d5fe..c5e3fee7d 100644
--- a/omnisharptest/omnisharpUnitTests/logging/omnisharpDebugModeLoggerObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/omnisharpDebugModeLoggerObserver.test.ts
@@ -2,8 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { use, should, expect } from 'chai';
-import * as chaiString from 'chai-string';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import {
     OmnisharpServerVerboseMessage,
@@ -18,10 +17,7 @@ import {
 } from '../../../src/omnisharp/loggingEvents';
 import { OmnisharpDebugModeLoggerObserver } from '../../../src/observers/omnisharpDebugModeLoggerObserver';
 
-use(chaiString);
-
-suite('OmnisharpDebugModeLoggerObserver', () => {
-    suiteSetup(() => should());
+describe('OmnisharpDebugModeLoggerObserver', () => {
     let logOutput = '';
     const observer = new OmnisharpDebugModeLoggerObserver({
         ...getNullChannel(),
@@ -30,45 +26,45 @@ suite('OmnisharpDebugModeLoggerObserver', () => {
         },
     });
 
-    setup(() => {
+    beforeEach(() => {
         logOutput = '';
     });
 
     [new OmnisharpServerVerboseMessage('server verbose message')].forEach((event: EventWithMessage) => {
         test(`${event.constructor.name}: Message is logged`, () => {
             observer.post(event);
-            expect(logOutput).to.contain(event.message);
+            expect(logOutput).toContain(event.message);
         });
     });
 
     test(`OmnisharpServerEnqueueRequest: Name and Command is logged`, () => {
         const event = new OmnisharpServerEnqueueRequest('foo', 'someCommand');
         observer.post(event);
-        expect(logOutput).to.contain(event.queueName);
-        expect(logOutput).to.contain(event.command);
+        expect(logOutput).toContain(event.queueName);
+        expect(logOutput).toContain(event.command);
     });
 
     test(`OmnisharpServerDequeueRequest: QueueName, QueueStatus, Command and Id is logged`, () => {
         const event = new OmnisharpServerDequeueRequest('foo', 'pending', 'someCommand', 1);
         observer.post(event);
-        expect(logOutput).to.contain(event.queueName);
-        expect(logOutput).to.contain(event.queueStatus);
-        expect(logOutput).to.contain(event.command);
-        expect(logOutput).to.contain(event.id);
+        expect(logOutput).toContain(event.queueName);
+        expect(logOutput).toContain(event.queueStatus);
+        expect(logOutput).toContain(event.command);
+        expect(logOutput).toContain(event.id?.toString());
     });
 
     test(`OmnisharpProcessRequestStart: Name and slots is logged`, () => {
         const event = new OmnisharpServerProcessRequestStart('foobar', 2);
         observer.post(event);
-        expect(logOutput).to.contain(event.name);
-        expect(logOutput).to.contain(event.availableRequestSlots);
+        expect(logOutput).toContain(event.name);
+        expect(logOutput).toContain(event.availableRequestSlots.toString());
     });
 
     test(`OmnisharpServerRequestCancelled: Name and Id is logged`, () => {
         const event = new OmnisharpServerRequestCancelled('foobar', 23);
         observer.post(event);
-        expect(logOutput).to.contain(event.command);
-        expect(logOutput).to.contain(event.id);
+        expect(logOutput).toContain(event.command);
+        expect(logOutput).toContain(event.id?.toString());
     });
 
     test(`OmnisharpServer messages increase and decrease indent`, () => {
@@ -78,12 +74,12 @@ suite('OmnisharpDebugModeLoggerObserver', () => {
         observer.post(new OmnisharpServerProcessRequestComplete());
         observer.post(new OmnisharpServerVerboseMessage('!indented_2'));
 
-        expect(logOutput).to.startWith('    !indented_1');
-        expect(logOutput).to.contain('\n        indented');
-        expect(logOutput).to.contain('\n    !indented_2');
+        expect(logOutput.startsWith('    !indented_1')).toBe(true);
+        expect(logOutput).toContain('\n        indented');
+        expect(logOutput).toContain('\n    !indented_2');
     });
 
-    suite('OmnisharpEventPacketReceived', () => {
+    describe('OmnisharpEventPacketReceived', () => {
         test(`Information messages with name OmniSharp.Middleware.LoggingMiddleware and follow pattern /^/[/w]+: 200 d+ms/ are logged`, () => {
             const event = new OmnisharpEventPacketReceived(
                 'INFORMATION',
@@ -91,8 +87,8 @@ suite('OmnisharpDebugModeLoggerObserver', () => {
                 '/codecheck: 200 339ms'
             );
             observer.post(event);
-            expect(logOutput).to.contain(event.message);
-            expect(logOutput).to.contain(event.name);
+            expect(logOutput).toContain(event.message);
+            expect(logOutput).toContain(event.name);
         });
 
         [
@@ -105,12 +101,12 @@ suite('OmnisharpDebugModeLoggerObserver', () => {
         ].forEach((event: OmnisharpEventPacketReceived) => {
             test(`${event.logLevel} messages are not logged`, () => {
                 observer.post(event);
-                expect(logOutput).to.be.empty;
+                expect(logOutput).toBeFalsy();
             });
         });
     });
 
-    suite('OmnisharpRequestMessage', () => {
+    describe('OmnisharpRequestMessage', () => {
         test(`Request Command and Id is logged`, () => {
             const event = new OmnisharpRequestMessage(
                 {
@@ -125,8 +121,8 @@ suite('OmnisharpDebugModeLoggerObserver', () => {
                 1
             );
             observer.post(event);
-            expect(logOutput).to.contain(event.id);
-            expect(logOutput).to.contain(event.request.command);
+            expect(logOutput).toContain(event.id?.toString());
+            expect(logOutput).toContain(event.request.command);
         });
 
         test(`Request Data is logged when it is not empty`, () => {
@@ -144,7 +140,7 @@ suite('OmnisharpDebugModeLoggerObserver', () => {
                 1
             );
             observer.post(event);
-            expect(logOutput).to.contain(event.request.data);
+            expect(logOutput).toContain(event.request.data);
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/omnisharpLoggerObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/omnisharpLoggerObserver.test.ts
index a27282258..2945d9d84 100644
--- a/omnisharptest/omnisharpUnitTests/logging/omnisharpLoggerObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/omnisharpLoggerObserver.test.ts
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { should, expect } from 'chai';
 import { getNullChannel } from '../../../test/unitTests/fakes';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { OmnisharpLoggerObserver } from '../../../src/observers/omnisharpLoggerObserver';
 import {
     OmnisharpServerMsBuildProjectDiagnostics,
@@ -20,9 +20,7 @@ import {
 import { OutputChannel } from 'vscode';
 import { PlatformInformation } from '../../../src/shared/platform';
 
-suite('OmnisharpLoggerObserver', () => {
-    suiteSetup(() => should());
-
+describe('OmnisharpLoggerObserver', () => {
     let logOutput = '';
     const channel = <OutputChannel>{
         ...getNullChannel(),
@@ -35,11 +33,11 @@ suite('OmnisharpLoggerObserver', () => {
         platform: 'TestOS',
     });
 
-    setup(() => {
+    beforeEach(() => {
         logOutput = '';
     });
 
-    suite('OmnisharpServerMsBuildProjectDiagnostics', () => {
+    describe('OmnisharpServerMsBuildProjectDiagnostics', () => {
         test('Logged message is empty if there are no warnings and erros', () => {
             const event = new OmnisharpServerMsBuildProjectDiagnostics({
                 FileName: 'someFile',
@@ -47,7 +45,7 @@ suite('OmnisharpLoggerObserver', () => {
                 Errors: [],
             });
             observer.post(event);
-            expect(logOutput).to.be.empty;
+            expect(logOutput).toBe('');
         });
 
         test(`Logged message contains the Filename if there is atleast one error or warning`, () => {
@@ -67,7 +65,7 @@ suite('OmnisharpLoggerObserver', () => {
                 Errors: [],
             });
             observer.post(event);
-            expect(logOutput).to.contain(event.diagnostics.FileName);
+            expect(logOutput).toContain(event.diagnostics.FileName);
         });
 
         [
@@ -100,20 +98,20 @@ suite('OmnisharpLoggerObserver', () => {
             test(`Logged message contains the Filename, StartColumn, StartLine and Text for the diagnostic warnings`, () => {
                 observer.post(event);
                 event.diagnostics.Warnings.forEach((element) => {
-                    expect(logOutput).to.contain(element.FileName);
-                    expect(logOutput).to.contain(element.StartLine);
-                    expect(logOutput).to.contain(element.StartColumn);
-                    expect(logOutput).to.contain(element.Text);
+                    expect(logOutput).toContain(element.FileName);
+                    expect(logOutput).toContain(element.StartLine.toString());
+                    expect(logOutput).toContain(element.StartColumn.toString());
+                    expect(logOutput).toContain(element.Text);
                 });
             });
 
             test(`Logged message contains the Filename, StartColumn, StartLine and Text for the diagnostics errors`, () => {
                 observer.post(event);
                 event.diagnostics.Errors.forEach((element) => {
-                    expect(logOutput).to.contain(element.FileName);
-                    expect(logOutput).to.contain(element.StartLine);
-                    expect(logOutput).to.contain(element.StartColumn);
-                    expect(logOutput).to.contain(element.Text);
+                    expect(logOutput).toContain(element.FileName);
+                    expect(logOutput).toContain(element.StartLine.toString());
+                    expect(logOutput).toContain(element.StartColumn.toString());
+                    expect(logOutput).toContain(element.Text);
                 });
             });
         });
@@ -123,7 +121,7 @@ suite('OmnisharpLoggerObserver', () => {
         (event: EventWithMessage) => {
             test(`${event.constructor.name}: Message is logged`, () => {
                 observer.post(event);
-                expect(logOutput).to.contain(event.message);
+                expect(logOutput).toContain(event.message);
             });
         }
     );
@@ -131,24 +129,24 @@ suite('OmnisharpLoggerObserver', () => {
     test(`OmnisharpServerOnServerError: Message is logged`, () => {
         const event = new OmnisharpServerOnServerError('on server error message');
         observer.post(event);
-        expect(logOutput).to.contain(event.err);
+        expect(logOutput).toContain(event.err);
     });
 
     [new OmnisharpInitialisation([], new Date(5), 'somePath')].forEach((event: OmnisharpInitialisation) => {
         test(`${event.constructor.name}: TimeStamp and SolutionPath are logged`, () => {
             observer.post(event);
-            expect(logOutput).to.contain(event.timeStamp.toLocaleString());
-            expect(logOutput).to.contain(event.solutionPath);
+            expect(logOutput).toContain(event.timeStamp.toLocaleString());
+            expect(logOutput).toContain(event.solutionPath);
         });
     });
 
     test('OmnisharpFailure: Failure message is logged', () => {
         const event = new OmnisharpFailure('failureMessage', new Error('errorMessage'));
         observer.post(event);
-        expect(logOutput).to.contain(event.message);
+        expect(logOutput).toContain(event.message);
     });
 
-    suite('OmnisharpEventPacketReceived', () => {
+    describe('OmnisharpEventPacketReceived', () => {
         [
             new OmnisharpEventPacketReceived('TRACE', 'foo', 'someMessage'),
             new OmnisharpEventPacketReceived('DEBUG', 'foo', 'someMessage'),
@@ -159,8 +157,8 @@ suite('OmnisharpLoggerObserver', () => {
         ].forEach((event: OmnisharpEventPacketReceived) => {
             test(`${event.logLevel} messages are logged with name and the message`, () => {
                 observer.post(event);
-                expect(logOutput).to.contain(event.name);
-                expect(logOutput).to.contain(event.message);
+                expect(logOutput).toContain(event.name);
+                expect(logOutput).toContain(event.message);
             });
         });
 
@@ -169,7 +167,7 @@ suite('OmnisharpLoggerObserver', () => {
             const fn = function () {
                 observer.post(event);
             };
-            expect(fn).to.throw(Error);
+            expect(fn).toThrow(Error);
         });
 
         test(`Information messages with name OmniSharp.Middleware.LoggingMiddleware and follow pattern /^/[/w]+: 200 d+ms/ are not logged`, () => {
@@ -179,11 +177,11 @@ suite('OmnisharpLoggerObserver', () => {
                 '/codecheck: 200 339ms'
             );
             observer.post(event);
-            expect(logOutput).to.be.empty;
+            expect(logOutput).toBe('');
         });
     });
 
-    suite('OmnisharpLaunch', () => {
+    describe('OmnisharpLaunch', () => {
         [
             {
                 event: new OmnisharpLaunch('5.8.0', undefined, true, 'someCommand', 4),
@@ -222,39 +220,39 @@ suite('OmnisharpLoggerObserver', () => {
 
             test(`Command and Pid are displayed`, () => {
                 observer.post(event);
-                expect(logOutput).to.contain(event.command);
-                expect(logOutput).to.contain(event.pid);
+                expect(logOutput).toContain(event.command);
+                expect(logOutput).toContain(event.pid.toString());
             });
 
             test(`Message is displayed depending on hostVersion and hostPath value`, () => {
                 observer.post(event);
-                expect(logOutput).to.contain(data.expected);
+                expect(logOutput).toContain(data.expected);
             });
         });
     });
 
-    suite('OmnisharpServerOnError', () => {
+    describe('OmnisharpServerOnError', () => {
         test(`Doesnot throw error if FileName is null`, () => {
             const event = new OmnisharpServerOnError({ Text: 'someText', FileName: null!, Line: 1, Column: 2 });
             const fn = function () {
                 observer.post(event);
             };
-            expect(fn).to.not.throw(Error);
+            expect(fn).not.toThrow(Error);
         });
 
         [new OmnisharpServerOnError({ Text: 'someText', FileName: 'someFile', Line: 1, Column: 2 })].forEach(
             (event: OmnisharpServerOnError) => {
                 test(`Contains the error message text`, () => {
                     observer.post(event);
-                    expect(logOutput).to.contain(event.errorMessage.Text);
+                    expect(logOutput).toContain(event.errorMessage.Text);
                 });
 
                 test(`Contains the error message FileName, Line and column if FileName is not null`, () => {
                     observer.post(event);
                     if (event.errorMessage.FileName) {
-                        expect(logOutput).to.contain(event.errorMessage.FileName);
-                        expect(logOutput).to.contain(event.errorMessage.Line);
-                        expect(logOutput).to.contain(event.errorMessage.Column);
+                        expect(logOutput).toContain(event.errorMessage.FileName);
+                        expect(logOutput).toContain(event.errorMessage.Line.toString());
+                        expect(logOutput).toContain(event.errorMessage.Column.toString());
                     }
                 });
             }
diff --git a/omnisharptest/omnisharpUnitTests/logging/omnisharpStatusBarObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/omnisharpStatusBarObserver.test.ts
index 9e729936e..5db4b97cf 100644
--- a/omnisharptest/omnisharpUnitTests/logging/omnisharpStatusBarObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/omnisharpStatusBarObserver.test.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { StatusBarItem } from '../../../src/vscodeAdapter';
 import {
     OmnisharpOnBeforeServerInstall,
@@ -17,15 +18,13 @@ import {
     BaseEvent,
     InstallationSuccess,
 } from '../../../src/omnisharp/loggingEvents';
-import { expect, should } from 'chai';
 import { OmnisharpStatusBarObserver, StatusBarColors } from '../../../src/observers/omnisharpStatusBarObserver';
 
-suite('OmnisharpStatusBarObserver', () => {
-    suiteSetup(() => should());
+describe('OmnisharpStatusBarObserver', () => {
     let showCalled: boolean;
     let hideCalled: boolean;
 
-    setup(() => {
+    beforeEach(() => {
         statusBarItem.text = '';
         statusBarItem.color = undefined;
         statusBarItem.command = undefined;
@@ -48,79 +47,79 @@ suite('OmnisharpStatusBarObserver', () => {
     [new OmnisharpServerOnServerError('someError')].forEach((event: BaseEvent) => {
         test(`${event.constructor.name}: Status bar is shown with the error text`, () => {
             observer.post(event);
-            expect(showCalled).to.be.true;
-            expect(statusBarItem.text).to.equal(`$(flame)`);
-            expect(statusBarItem.command).to.equal('o.showOutput');
-            expect(statusBarItem.tooltip).to.equal('Error starting OmniSharp');
-            expect(statusBarItem.color).to.equal(StatusBarColors.Red);
+            expect(showCalled).toBe(true);
+            expect(statusBarItem.text).toEqual(`$(flame)`);
+            expect(statusBarItem.command).toEqual('o.showOutput');
+            expect(statusBarItem.tooltip).toEqual('Error starting OmniSharp');
+            expect(statusBarItem.color).toEqual(StatusBarColors.Red);
         });
     });
 
     test(`${OmnisharpServerOnStdErr.name}: Status bar is shown with the error text`, () => {
         const event = new OmnisharpServerOnStdErr('std error');
         observer.post(event);
-        expect(showCalled).to.be.true;
-        expect(statusBarItem.color).to.equal(StatusBarColors.Red);
-        expect(statusBarItem.text).to.equal(`$(flame)`);
-        expect(statusBarItem.command).to.equal('o.showOutput');
-        expect(statusBarItem.tooltip).to.contain(event.message);
+        expect(showCalled).toBe(true);
+        expect(statusBarItem.color).toEqual(StatusBarColors.Red);
+        expect(statusBarItem.text).toEqual(`$(flame)`);
+        expect(statusBarItem.command).toEqual('o.showOutput');
+        expect(statusBarItem.tooltip).toContain(event.message);
     });
 
     test('OnBeforeServerInstall: Status bar is shown with the installation text', () => {
         const event = new OmnisharpOnBeforeServerInstall();
         observer.post(event);
-        expect(showCalled).to.be.true;
-        expect(statusBarItem.text).to.be.equal('$(flame) Installing OmniSharp...');
-        expect(statusBarItem.command).to.equal('o.showOutput');
+        expect(showCalled).toBe(true);
+        expect(statusBarItem.text).toEqual('$(flame) Installing OmniSharp...');
+        expect(statusBarItem.command).toEqual('o.showOutput');
     });
 
     test('OnBeforeServerStart: Status bar is shown with the starting text', () => {
         const event = new OmnisharpOnBeforeServerStart();
         observer.post(event);
-        expect(showCalled).to.be.true;
-        expect(statusBarItem.color).to.equal(StatusBarColors.Yellow);
-        expect(statusBarItem.text).to.be.equal('$(flame)');
-        expect(statusBarItem.command).to.equal('o.showOutput');
-        expect(statusBarItem.tooltip).to.equal('Starting OmniSharp server');
+        expect(showCalled).toBe(true);
+        expect(statusBarItem.color).toEqual(StatusBarColors.Yellow);
+        expect(statusBarItem.text).toEqual('$(flame)');
+        expect(statusBarItem.command).toEqual('o.showOutput');
+        expect(statusBarItem.tooltip).toEqual('Starting OmniSharp server');
     });
 
     test('OnServerStart: Status bar is shown with the flame and "Running" text', () => {
         const event = new OmnisharpServerOnStart();
         observer.post(event);
-        expect(showCalled).to.be.true;
-        expect(statusBarItem.text).to.be.equal('$(flame)');
-        expect(statusBarItem.command).to.equal('o.showOutput');
-        expect(statusBarItem.tooltip).to.be.equal('OmniSharp server is running');
+        expect(showCalled).toBe(true);
+        expect(statusBarItem.text).toEqual('$(flame)');
+        expect(statusBarItem.command).toEqual('o.showOutput');
+        expect(statusBarItem.tooltip).toEqual('OmniSharp server is running');
     });
 
     test('OnServerStop: Status bar is hidden and the attributes are set to undefined', () => {
         const event = new OmnisharpServerOnStop();
         observer.post(event);
-        expect(hideCalled).to.be.true;
-        expect(statusBarItem.text).to.be.equal('');
-        expect(statusBarItem.command).to.be.undefined;
-        expect(statusBarItem.color).to.be.undefined;
+        expect(hideCalled).toBe(true);
+        expect(statusBarItem.text).toEqual('');
+        expect(statusBarItem.command).toBe(undefined);
+        expect(statusBarItem.color).toBe(undefined);
     });
 
     test('DownloadStart: Text and tooltip are set ', () => {
         const event = new DownloadStart('somePackage');
         observer.post(event);
-        expect(statusBarItem.text).to.contain('Downloading packages');
-        expect(statusBarItem.tooltip).to.contain(event.packageDescription);
+        expect(statusBarItem.text).toContain('Downloading packages');
+        expect(statusBarItem.tooltip).toContain(event.packageDescription);
     });
 
     test('InstallationProgress: Text and tooltip are set', () => {
         const event = new InstallationStart('somePackage');
         observer.post(event);
-        expect(statusBarItem.text).to.contain('Installing packages');
-        expect(statusBarItem.tooltip).to.contain(event.packageDescription);
+        expect(statusBarItem.text).toContain('Installing packages');
+        expect(statusBarItem.tooltip).toContain(event.packageDescription);
     });
 
     test('DownloadProgress: Tooltip contains package description and download percentage', () => {
         const event = new DownloadProgress(50, 'somePackage');
         observer.post(event);
-        expect(statusBarItem.tooltip).to.contain(event.packageDescription);
-        expect(statusBarItem.tooltip).to.contain(event.downloadPercentage);
+        expect(statusBarItem.tooltip).toContain(event.packageDescription);
+        expect(statusBarItem.tooltip).toContain(event.downloadPercentage.toString());
     });
 
     test('InstallationSuccess: Status bar is hidden and the attributes are set to undefined', () => {
@@ -130,9 +129,9 @@ suite('OmnisharpStatusBarObserver', () => {
         const successEvent = new InstallationSuccess();
         observer.post(successEvent);
 
-        expect(hideCalled).to.be.true;
-        expect(statusBarItem.text).to.be.equal('');
-        expect(statusBarItem.command).to.be.undefined;
-        expect(statusBarItem.color).to.be.undefined;
+        expect(hideCalled).toBe(true);
+        expect(statusBarItem.text).toEqual('');
+        expect(statusBarItem.command).toBe(undefined);
+        expect(statusBarItem.color).toBe(undefined);
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/projectStatusBarObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/projectStatusBarObserver.test.ts
index c88b12a22..b06f6070b 100644
--- a/omnisharptest/omnisharpUnitTests/logging/projectStatusBarObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/projectStatusBarObserver.test.ts
@@ -3,15 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { expect, should } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { getWorkspaceInformationUpdated, getMSBuildWorkspaceInformation } from '../../../test/unitTests/fakes';
 import { StatusBarItem } from '../../../src/vscodeAdapter';
 import { ProjectStatusBarObserver } from '../../../src/observers/projectStatusBarObserver';
 import { OmnisharpOnMultipleLaunchTargets, OmnisharpServerOnStop } from '../../../src/omnisharp/loggingEvents';
 
-suite('ProjectStatusBarObserver', () => {
-    suiteSetup(() => should());
-
+describe('ProjectStatusBarObserver', () => {
     let showCalled: boolean;
     let hideCalled: boolean;
     const statusBarItem = <StatusBarItem>{
@@ -24,7 +22,7 @@ suite('ProjectStatusBarObserver', () => {
     };
     const observer = new ProjectStatusBarObserver(statusBarItem);
 
-    setup(() => {
+    beforeEach(() => {
         showCalled = false;
         hideCalled = false;
     });
@@ -32,35 +30,35 @@ suite('ProjectStatusBarObserver', () => {
     test('OnServerStop: Status bar is hidden and the attributes are set to undefined', () => {
         const event = new OmnisharpServerOnStop();
         observer.post(event);
-        expect(hideCalled).to.be.true;
-        expect(statusBarItem.text).to.be.equal('');
-        expect(statusBarItem.command).to.be.undefined;
-        expect(statusBarItem.color).to.be.undefined;
+        expect(hideCalled).toBe(true);
+        expect(statusBarItem.text).toEqual('');
+        expect(statusBarItem.command).toBe(undefined);
+        expect(statusBarItem.color).toBe(undefined);
     });
 
     test('OnMultipleLaunchTargets: Status bar is shown with the select project option and the comand to pick a project', () => {
         const event = new OmnisharpOnMultipleLaunchTargets([]);
         observer.post(event);
-        expect(showCalled).to.be.true;
-        expect(statusBarItem.text).to.contain('Select project');
-        expect(statusBarItem.command).to.equal('o.pickProjectAndStart');
+        expect(showCalled).toBe(true);
+        expect(statusBarItem.text).toContain('Select project');
+        expect(statusBarItem.command).toEqual('o.pickProjectAndStart');
     });
 
-    suite('WorkspaceInformationUpdated', () => {
+    describe('WorkspaceInformationUpdated', () => {
         test('Project status is hidden if there is no MSBuild Object', () => {
             const event = getWorkspaceInformationUpdated(undefined);
             observer.post(event);
-            expect(hideCalled).to.be.true;
-            expect(statusBarItem.text).to.be.equal('');
-            expect(statusBarItem.command).to.be.undefined;
+            expect(hideCalled).toBe(true);
+            expect(statusBarItem.text).toEqual('');
+            expect(statusBarItem.command).toBe(undefined);
         });
 
         test('Project status is shown if there is an MSBuild object', () => {
             const event = getWorkspaceInformationUpdated(getMSBuildWorkspaceInformation('somePath', []));
             observer.post(event);
-            expect(showCalled).to.be.true;
-            expect(statusBarItem.text).to.contain(event.info.MsBuild?.SolutionPath);
-            expect(statusBarItem.command).to.equal('o.pickProjectAndStart');
+            expect(showCalled).toBe(true);
+            expect(statusBarItem.text).toContain(event.info.MsBuild?.SolutionPath);
+            expect(statusBarItem.command).toEqual('o.pickProjectAndStart');
         });
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/razorLoggerObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/razorLoggerObserver.test.ts
index 486d6e1c5..842608194 100644
--- a/omnisharptest/omnisharpUnitTests/logging/razorLoggerObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/razorLoggerObserver.test.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { should, expect } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { getNullChannel } from '../../../test/unitTests/fakes';
 import { RazorLoggerObserver } from '../../../src/observers/razorLoggerObserver';
 import {
@@ -11,8 +11,7 @@ import {
     RazorDevModeActive,
 } from '../../../src/omnisharp/loggingEvents';
 
-suite('RazorLoggerObserver', () => {
-    suiteSetup(() => should());
+describe('RazorLoggerObserver', () => {
     let logOutput = '';
     const observer = new RazorLoggerObserver({
         ...getNullChannel(),
@@ -21,25 +20,25 @@ suite('RazorLoggerObserver', () => {
         },
     });
 
-    setup(() => {
+    beforeEach(() => {
         logOutput = '';
     });
 
     test(`RazorPluginPathSpecified: Path is logged`, () => {
         const event = new RazorPluginPathSpecified('somePath');
         observer.post(event);
-        expect(logOutput).to.contain(event.path);
+        expect(logOutput).toContain(event.path);
     });
 
     test(`RazorPluginPathDoesNotExist: Path is logged`, () => {
         const event = new RazorPluginPathDoesNotExist('somePath');
         observer.post(event);
-        expect(logOutput).to.contain(event.path);
+        expect(logOutput).toContain(event.path);
     });
 
     test(`RazorDevModeActive: Logs dev mode active`, () => {
         const event = new RazorDevModeActive();
         observer.post(event);
-        expect(logOutput).to.contain('Razor dev mode active');
+        expect(logOutput).toContain('Razor dev mode active');
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/logging/warningMessageObserver.test.ts b/omnisharptest/omnisharpUnitTests/logging/warningMessageObserver.test.ts
index 90b830bb0..73e867cc4 100644
--- a/omnisharptest/omnisharpUnitTests/logging/warningMessageObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/logging/warningMessageObserver.test.ts
@@ -2,9 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import { WarningMessageObserver } from '../../../src/observers/warningMessageObserver';
-import { assert, expect, should } from 'chai';
 import {
     getFakeVsCode,
     getMSBuildDiagnosticsMessage,
@@ -16,9 +15,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { from as observableFrom, Subject } from 'rxjs';
 import { timeout, map } from 'rxjs/operators';
 
-suite('WarningMessageObserver', () => {
-    suiteSetup(() => should());
-
+describe('WarningMessageObserver', () => {
     let doClickOk: () => void;
     let doClickCancel: () => void;
     let signalCommandDone: () => void;
@@ -55,9 +52,11 @@ suite('WarningMessageObserver', () => {
         return undefined;
     };
 
-    setup(() => {
+    beforeEach(() => {
         assertionObservable = new Subject<string>();
-        scheduler = new TestScheduler(assert.deepEqual);
+        scheduler = new TestScheduler((actual, expected) => {
+            expect(actual).toStrictEqual(expected);
+        });
         scheduler.maxFrames = 9000;
         observer = new WarningMessageObserver(vscode, () => false, scheduler);
         warningMessages = [];
@@ -80,8 +79,8 @@ suite('WarningMessageObserver', () => {
         const eventList = scheduler.createHotObservable(marble, marble_event_map);
         eventList.subscribe((e) => observer.post(e));
         scheduler.flush();
-        expect(warningMessages).to.be.empty;
-        expect(invokedCommand).to.be.undefined;
+        expect(warningMessages).toHaveLength(0);
+        expect(invokedCommand).toBe(undefined);
     });
 
     test('OmnisharpServerMsBuildProjectDiagnostics: No event is posted if warning is disabled', () => {
@@ -96,8 +95,8 @@ suite('WarningMessageObserver', () => {
         const eventList = scheduler.createHotObservable(marble, marble_event_map);
         eventList.subscribe((e) => newObserver.post(e));
         scheduler.flush();
-        expect(warningMessages).to.be.empty;
-        expect(invokedCommand).to.be.undefined;
+        expect(warningMessages).toHaveLength(0);
+        expect(invokedCommand).toBe(undefined);
     });
 
     [
@@ -134,7 +133,7 @@ suite('WarningMessageObserver', () => {
             command: 'o.showOutput',
         },
     ].forEach((elem) => {
-        suite(`${elem.eventA.constructor.name}`, () => {
+        describe(`${elem.eventA.constructor.name}`, () => {
             test(`When the event is fired then a warning message is displayed`, () => {
                 const marble = `${timeToMarble(1500)}a`;
                 const marble_event_map = { a: elem.eventA };
@@ -142,8 +141,8 @@ suite('WarningMessageObserver', () => {
                 eventList.subscribe((e) => observer.post(e));
                 scheduler.expectObservable(assertionObservable).toBe(`${timeToMarble(3000)}a`, { a: elem.assertion1 });
                 scheduler.flush();
-                expect(warningMessages.length).to.be.equal(1);
-                expect(warningMessages[0]).to.be.equal(elem.expected);
+                expect(warningMessages.length).toEqual(1);
+                expect(warningMessages[0]).toEqual(elem.expected);
             });
 
             test(`When events are fired rapidly, then they are debounced by 1500 ms`, () => {
@@ -154,8 +153,8 @@ suite('WarningMessageObserver', () => {
                 scheduler.expectObservable(assertionObservable).toBe(`${timeToMarble(3520)}a`, { a: elem.assertion1 });
                 scheduler.flush();
 
-                expect(warningMessages.length).to.be.equal(1);
-                expect(warningMessages[0]).to.be.equal(elem.expected);
+                expect(warningMessages.length).toEqual(1);
+                expect(warningMessages[0]).toEqual(elem.expected);
             });
 
             test(`When events are 1500 ms apart, then they are not debounced`, () => {
@@ -168,8 +167,8 @@ suite('WarningMessageObserver', () => {
                     b: elem.assertion2,
                 });
                 scheduler.flush();
-                expect(warningMessages.length).to.be.equal(2);
-                expect(warningMessages[0]).to.be.equal(elem.expected);
+                expect(warningMessages.length).toEqual(2);
+                expect(warningMessages[0]).toEqual(elem.expected);
             });
 
             test(`Given a warning message, when the user clicks ok the command is executed`, async () => {
@@ -179,7 +178,7 @@ suite('WarningMessageObserver', () => {
                 scheduler.flush();
                 doClickOk();
                 await commandDone;
-                expect(invokedCommand).to.be.equal(elem.command);
+                expect(invokedCommand).toEqual(elem.command);
             });
 
             test(`Given a warning message, when the user clicks cancel the command is not executed`, async () => {
@@ -188,8 +187,8 @@ suite('WarningMessageObserver', () => {
                 scheduler.expectObservable(eventList.pipe(map((e) => observer.post(e))));
                 scheduler.flush();
                 doClickCancel();
-                await expect(observableFrom(commandDone).pipe(timeout(1)).toPromise()).to.be.rejected;
-                expect(invokedCommand).to.be.undefined;
+                await expect(observableFrom(commandDone).pipe(timeout(1)).toPromise()).rejects.toThrow();
+                expect(invokedCommand).toBe(undefined);
             });
         });
     });
diff --git a/omnisharptest/omnisharpUnitTests/omnisharp/omniSharpMonoResolver.test.ts b/omnisharptest/omnisharpUnitTests/omnisharp/omniSharpMonoResolver.test.ts
index 0f04d0ca9..d084153cb 100644
--- a/omnisharptest/omnisharpUnitTests/omnisharp/omniSharpMonoResolver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/omnisharp/omniSharpMonoResolver.test.ts
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
+import { describe, test, expect, beforeEach, jest } from '@jest/globals';
 import { OmniSharpMonoResolver } from '../../../src/omnisharp/omniSharpMonoResolver';
 
-import { Options } from '../../../src/shared/options';
-import { expect } from 'chai';
 import { join } from 'path';
-import { getEmptyOptions } from '../fakes/fakeOptions';
+import { getWorkspaceConfiguration } from '../../../test/unitTests/fakes';
 
-suite(`${OmniSharpMonoResolver.name}`, () => {
+describe(`${OmniSharpMonoResolver.name}`, () => {
     let getMonoCalled: boolean;
-    let options: Options;
 
     const monoPath = 'monoPath';
 
@@ -25,42 +24,32 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
         return Promise.resolve(version);
     };
 
-    setup(() => {
+    beforeEach(() => {
         getMonoCalled = false;
-        options = getEmptyOptions();
+        jest.spyOn(vscode.workspace, 'getConfiguration').mockReturnValue(getWorkspaceConfiguration());
+        vscode.workspace.getConfiguration().update('omnisharp.monoPath', monoPath);
     });
 
     test(`it returns the path and version if the version is greater than or equal to ${requiredMonoVersion}`, async () => {
         const monoResolver = new OmniSharpMonoResolver(getMono(higherMonoVersion));
-        const monoInfo = await monoResolver.getHostExecutableInfo({
-            ...options,
-            omnisharpOptions: { ...options.omnisharpOptions, monoPath: monoPath },
-        });
+        const monoInfo = await monoResolver.getHostExecutableInfo();
 
-        expect(monoInfo.version).to.be.equal(higherMonoVersion);
-        expect(monoInfo.path).to.be.equal(monoPath);
+        expect(monoInfo.version).toEqual(higherMonoVersion);
+        expect(monoInfo.path).toEqual(monoPath);
     });
 
     test(`it throws exception if version is less than ${requiredMonoVersion}`, async () => {
         const monoResolver = new OmniSharpMonoResolver(getMono(lowerMonoVersion));
 
-        await expect(
-            monoResolver.getHostExecutableInfo({
-                ...options,
-                omnisharpOptions: { ...options.omnisharpOptions, monoPath: monoPath },
-            })
-        ).to.be.rejected;
+        await expect(monoResolver.getHostExecutableInfo()).rejects.toThrow();
     });
 
     test('sets the environment with the monoPath', async () => {
         const monoResolver = new OmniSharpMonoResolver(getMono(requiredMonoVersion));
-        const monoInfo = await monoResolver.getHostExecutableInfo({
-            ...options,
-            omnisharpOptions: { ...options.omnisharpOptions, monoPath: monoPath },
-        });
+        const monoInfo = await monoResolver.getHostExecutableInfo();
 
-        expect(getMonoCalled).to.be.equal(true);
-        expect(monoInfo.env['PATH']).to.contain(join(monoPath, 'bin'));
-        expect(monoInfo.env['MONO_GAC_PREFIX']).to.be.equal(monoPath);
+        expect(getMonoCalled).toEqual(true);
+        expect(monoInfo.env['PATH']).toContain(join(monoPath, 'bin'));
+        expect(monoInfo.env['MONO_GAC_PREFIX']).toEqual(monoPath);
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts
index d80ba1afe..07a0ab96e 100644
--- a/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts
+++ b/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
 import { OmnisharpDownloader } from '../../src/omnisharp/omnisharpDownloader';
 import NetworkSettings from '../../src/networkSettings';
 import { EventStream } from '../../src/eventStream';
@@ -10,10 +11,9 @@ import { PlatformInformation } from '../../src/shared/platform';
 import { CreateTmpDir, TmpAsset } from '../../src/createTmpAsset';
 import * as util from '../../src/common';
 import * as path from 'path';
-import MockHttpsServer from './testAssets/mockHttpsServer';
-import { expect } from 'chai';
-import TestZip from './testAssets/testZip';
-import { createTestFile } from './testAssets/testFile';
+import MockHttpsServer from '../omnisharpUnitTests/testAssets/mockHttpsServer';
+import TestZip from '../omnisharpUnitTests/testAssets/testZip';
+import { createTestFile } from '../omnisharpUnitTests/testAssets/testFile';
 import {
     PackageInstallation,
     LogPlatformInfo,
@@ -25,12 +25,12 @@ import {
     InstallationSuccess,
     PackageInstallStart,
 } from '../../src/omnisharp/loggingEvents';
-import TestEventBus from './testAssets/testEventBus';
-import { testPackageJSON } from './testAssets/testAssets';
+import TestEventBus from '../omnisharpUnitTests/testAssets/testEventBus';
+import { testPackageJSON } from '../omnisharpUnitTests/testAssets/testAssets';
 import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator';
 
 [true, false].forEach((useFramework) => {
-    suite(`OmnisharpDownloader (useFramework: ${useFramework})`, () => {
+    describe(`OmnisharpDownloader (useFramework: ${useFramework})`, () => {
         const networkSettingsProvider = () => new NetworkSettings('', false);
         let eventStream: EventStream;
         const installPath = 'somePath';
@@ -44,7 +44,7 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator';
         let eventBus: TestEventBus;
         const suffix = useFramework ? '' : `-net${modernNetVersion}`;
 
-        setup(async () => {
+        beforeEach(async () => {
             eventStream = new EventStream();
             eventBus = new TestEventBus(eventStream);
             tmpDir = await CreateTmpDir(true);
@@ -79,14 +79,14 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator';
                     server.baseUrl,
                     installPath
                 )
-            ).to.be.false;
+            ).toBe(false);
         });
 
         test('Packages are downloaded and installed', async () => {
             await downloader.DownloadAndInstallOmnisharp(version, useFramework, server.baseUrl, installPath);
             for (const elem of testZip.files) {
                 const filePath = path.join(extensionPath, installPath, version + suffix, elem.path);
-                expect(await util.fileExists(filePath)).to.be.true;
+                expect(await util.fileExists(filePath)).toBe(true);
             }
         });
 
@@ -110,12 +110,12 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator';
                 new InstallationSuccess(),
             ];
 
-            expect(eventBus.getEvents()).to.be.empty;
+            expect(eventBus.getEvents()).toHaveLength(0);
             await downloader.DownloadAndInstallOmnisharp(version, useFramework, server.baseUrl, installPath);
-            expect(eventBus.getEvents()).to.be.deep.equal(expectedSequence);
+            expect(eventBus.getEvents()).toStrictEqual(expectedSequence);
         });
 
-        teardown(async () => {
+        afterEach(async () => {
             tmpDir.dispose();
             await server.stop();
             eventBus.dispose();
diff --git a/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts
index e57f07100..df54ac707 100644
--- a/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts
+++ b/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
 import { OmnisharpManager } from '../../src/omnisharp/omnisharpManager';
-import MockHttpsServer from './testAssets/mockHttpsServer';
-import TestZip from './testAssets/testZip';
-import { createTestFile } from './testAssets/testFile';
+import MockHttpsServer from '../omnisharpUnitTests/testAssets/mockHttpsServer';
+import TestZip from '../omnisharpUnitTests/testAssets/testZip';
+import { createTestFile } from '../omnisharpUnitTests/testAssets/testFile';
 import { PlatformInformation } from '../../src/shared/platform';
 import { OmnisharpDownloader } from '../../src/omnisharp/omnisharpDownloader';
 import NetworkSettings from '../../src/networkSettings';
 import { EventStream } from '../../src/eventStream';
-import { testPackageJSON } from './testAssets/testAssets';
+import { testPackageJSON } from '../omnisharpUnitTests/testAssets/testAssets';
 import { TmpAsset, CreateTmpDir, CreateTmpFile } from '../../src/createTmpAsset';
-import { expect } from 'chai';
 import * as path from 'path';
 import * as util from '../../src/common';
 import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator';
 
-suite(OmnisharpManager.name, () => {
+describe(OmnisharpManager.name, () => {
     let server: MockHttpsServer;
     const eventStream = new EventStream();
     let manager: OmnisharpManager;
@@ -85,8 +85,8 @@ suite(OmnisharpManager.name, () => {
             useFramework: true,
         },
     ].forEach((elem) => {
-        suite(elem.platformInfo.toString(), () => {
-            setup(async () => {
+        describe(`${elem.platformInfo.toString()},${elem.platformId},framework:${elem.useFramework},`, () => {
+            beforeEach(async () => {
                 server = await MockHttpsServer.CreateMockHttpsServer();
                 await server.start();
                 tmpInstallDir = await CreateTmpDir(true);
@@ -131,13 +131,13 @@ suite(OmnisharpManager.name, () => {
             test('Throws error if the path is neither an absolute path nor a valid semver, nor the string "latest"', async () => {
                 expect(
                     manager.GetOmniSharpLaunchPath(defaultVersion, 'Some incorrect path', useFramework, extensionPath)
-                ).to.be.rejectedWith(Error);
+                ).rejects.toThrowError(Error);
             });
 
             test('Throws error when the specified path is an invalid semver', async () => {
                 expect(
                     manager.GetOmniSharpLaunchPath(defaultVersion, 'a.b.c', useFramework, extensionPath)
-                ).to.be.rejectedWith(Error);
+                ).rejects.toThrowError(Error);
             });
 
             test('Returns the same path if absolute path to an existing file is passed', async () => {
@@ -148,7 +148,7 @@ suite(OmnisharpManager.name, () => {
                     useFramework,
                     extensionPath
                 );
-                expect(launchPath).to.be.equal(tmpFile.name);
+                expect(launchPath).toEqual(tmpFile.name);
             });
 
             test('Returns the default path if the omnisharp path is empty', async () => {
@@ -160,16 +160,16 @@ suite(OmnisharpManager.name, () => {
                 );
                 if (useFramework) {
                     if (elem.platformInfo.isWindows()) {
-                        expect(launchPath).to.be.equal(
+                        expect(launchPath).toEqual(
                             path.join(extensionPath, '.omnisharp', defaultVersion + suffix, 'OmniSharp.exe')
                         );
                     } else {
-                        expect(launchPath).to.be.equal(
+                        expect(launchPath).toEqual(
                             path.join(extensionPath, '.omnisharp', defaultVersion, 'omnisharp', 'OmniSharp.exe')
                         );
                     }
                 } else {
-                    expect(launchPath).to.be.equal(
+                    expect(launchPath).toEqual(
                         path.join(extensionPath, '.omnisharp', defaultVersion + suffix, 'OmniSharp.dll')
                     );
                 }
@@ -184,16 +184,16 @@ suite(OmnisharpManager.name, () => {
                 );
                 if (useFramework) {
                     if (elem.platformInfo.isWindows()) {
-                        expect(launchPath).to.be.equal(
+                        expect(launchPath).toEqual(
                             path.join(extensionPath, installPath, latestVersion + suffix, 'OmniSharp.exe')
                         );
                     } else {
-                        expect(launchPath).to.be.equal(
+                        expect(launchPath).toEqual(
                             path.join(extensionPath, installPath, latestVersion, 'omnisharp', 'OmniSharp.exe')
                         );
                     }
                 } else {
-                    expect(launchPath).to.be.equal(
+                    expect(launchPath).toEqual(
                         path.join(extensionPath, installPath, latestVersion + suffix, 'OmniSharp.dll')
                     );
                 }
@@ -208,16 +208,16 @@ suite(OmnisharpManager.name, () => {
                 );
                 if (useFramework) {
                     if (elem.platformInfo.isWindows()) {
-                        expect(launchPath).to.be.equal(
+                        expect(launchPath).toEqual(
                             path.join(extensionPath, installPath, testVersion + suffix, 'OmniSharp.exe')
                         );
                     } else {
-                        expect(launchPath).to.be.equal(
+                        expect(launchPath).toEqual(
                             path.join(extensionPath, installPath, testVersion, 'omnisharp', 'OmniSharp.exe')
                         );
                     }
                 } else {
-                    expect(launchPath).to.be.equal(
+                    expect(launchPath).toEqual(
                         path.join(extensionPath, installPath, testVersion + suffix, 'OmniSharp.dll')
                     );
                 }
@@ -227,13 +227,13 @@ suite(OmnisharpManager.name, () => {
                 await manager.GetOmniSharpLaunchPath(defaultVersion, testVersion, useFramework, extensionPath);
                 for (const elem of testZip.files) {
                     const filePath = path.join(extensionPath, installPath, testVersion + suffix, elem.path);
-                    expect(await util.fileExists(filePath)).to.be.true;
+                    expect(await util.fileExists(filePath)).toBe(true);
                 }
             });
         });
     });
 
-    teardown(async () => {
+    afterEach(async () => {
         await server.stop();
         if (tmpFile) {
             tmpFile.dispose();
diff --git a/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts
index f566a3226..df9c5e78e 100644
--- a/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts
+++ b/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts
@@ -3,203 +3,199 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assert, should } from 'chai';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import {
     SetBinaryAndGetPackage,
     GetPackagesFromVersion,
     modernNetVersion,
 } from '../../src/omnisharp/omnisharpPackageCreator';
 import { Package } from '../../src/packageManager/package';
-import { testPackageJSON } from './testAssets/testAssets';
+import { testPackageJSON } from '../omnisharpUnitTests/testAssets/testAssets';
 import { isNotNull } from '../testUtil';
 
-suite(
-    'GetOmnisharpPackage : Output package depends on the input package and other input parameters like serverUrl',
-    () => {
-        let serverUrl: string;
-        let version: string;
-        let installPath: string;
-        let inputPackages: Package[];
+describe('GetOmnisharpPackage : Output package depends on the input package and other input parameters like serverUrl', () => {
+    let serverUrl: string;
+    let version: string;
+    let installPath: string;
+    let inputPackages: Package[];
 
-        suiteSetup(() => {
-            serverUrl = 'http://serverUrl';
-            version = '0.0.0';
-            installPath = 'testPath';
-            const packageJSON = testPackageJSON;
-            inputPackages = <Package[]>packageJSON.runtimeDependencies;
-            should();
-        });
-
-        const useFrameworkOptions = [true, false];
-
-        useFrameworkOptions.forEach((useFramework) => {
-            const pathSuffix = useFramework ? '' : `-net${modernNetVersion}`;
+    beforeEach(() => {
+        serverUrl = 'http://serverUrl';
+        version = '0.0.0';
+        installPath = 'testPath';
+        const packageJSON = testPackageJSON;
+        inputPackages = <Package[]>packageJSON.runtimeDependencies;
+    });
 
-            test(`Architectures, binaries and platforms do not change useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'os-architecture'
-                );
-                isNotNull(testPackage);
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage,
-                    useFramework,
-                    serverUrl,
-                    version,
-                    installPath
-                );
+    const useFrameworkOptions = [true, false];
 
-                resultPackage.architectures.should.equal(testPackage.architectures);
-                assert.equal(resultPackage.binaries, testPackage.binaries);
-                resultPackage.platforms.should.equal(testPackage.platforms);
-            });
+    useFrameworkOptions.forEach((useFramework) => {
+        const pathSuffix = useFramework ? '' : `-net${modernNetVersion}`;
 
-            test(`Version information is appended to the description useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'os-architecture'
-                );
-                isNotNull(testPackage);
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    installPath
-                );
+        test(`Architectures, binaries and platforms do not change ${useFramework ? 'on framework' : ''}`, () => {
+            const testPackage = inputPackages.find(
+                (element) => element.platformId && element.platformId == 'os-architecture'
+            );
+            isNotNull(testPackage);
+            const resultPackage = SetBinaryAndGetPackage(testPackage, useFramework, serverUrl, version, installPath);
 
-                resultPackage.description.should.equal(`${testPackage.description}, Version = 1.2.3`);
-            });
+            expect(resultPackage.architectures).toEqual(testPackage.architectures);
+            expect(resultPackage.binaries).toEqual(testPackage.binaries);
+            expect(resultPackage.platforms).toEqual(testPackage.platforms);
+        });
 
-            test(`Install path is calculated using the specified path and version useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'os-architecture'
-                );
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage!,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    'experimentPath'
-                );
-                resultPackage.installPath!.should.equal(`experimentPath/1.2.3${pathSuffix}`);
-            });
+        test(`Version information is appended to the description useFramework: ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
+            const testPackage = inputPackages.find(
+                (element) => element.platformId && element.platformId == 'os-architecture'
+            );
+            isNotNull(testPackage);
+            const resultPackage = SetBinaryAndGetPackage(testPackage, useFramework, serverUrl, '1.2.3', installPath);
 
-            test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x86) useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'win-x86'
-                );
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage!,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    'experimentPath'
-                );
-                resultPackage.installTestPath!.should.equal(
-                    `./experimentPath/1.2.3${pathSuffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}`
-                );
-            });
+            expect(resultPackage.description).toEqual(`${testPackage.description}, Version = 1.2.3`);
+        });
 
-            test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x64) useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'win-x64'
-                );
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage!,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    'experimentPath'
-                );
-                resultPackage.installTestPath!.should.equal(
-                    `./experimentPath/1.2.3${pathSuffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}`
-                );
-            });
+        test(`Install path is calculated using the specified path and version ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
+            const testPackage = inputPackages.find(
+                (element) => element.platformId && element.platformId == 'os-architecture'
+            );
+            const resultPackage = SetBinaryAndGetPackage(
+                testPackage!,
+                useFramework,
+                serverUrl,
+                '1.2.3',
+                'experimentPath'
+            );
+            expect(resultPackage.installPath).toEqual(`experimentPath/1.2.3${pathSuffix}`);
+        });
 
-            test(`Install test path is calculated using specified path, version and ends with correct binary - OSX useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find((element) => element.platformId && element.platformId == 'osx');
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage!,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    'experimentPath'
-                );
-                resultPackage.installTestPath!.should.equal(
-                    `./experimentPath/1.2.3${pathSuffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
-                );
-            });
+        test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x86) ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
+            const testPackage = inputPackages.find((element) => element.platformId && element.platformId == 'win-x86');
+            const resultPackage = SetBinaryAndGetPackage(
+                testPackage!,
+                useFramework,
+                serverUrl,
+                '1.2.3',
+                'experimentPath'
+            );
+            expect(resultPackage.installTestPath).toEqual(
+                `./experimentPath/1.2.3${pathSuffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}`
+            );
+        });
 
-            test(`Install test path is calculated using specified path, version and ends with correct binary - Linux(x86) useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'linux-x86'
-                );
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage!,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    'experimentPath'
-                );
-                resultPackage.installTestPath!.should.equal(
-                    `./experimentPath/1.2.3${pathSuffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
-                );
-            });
+        test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x64) ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
+            const testPackage = inputPackages.find((element) => element.platformId && element.platformId == 'win-x64');
+            const resultPackage = SetBinaryAndGetPackage(
+                testPackage!,
+                useFramework,
+                serverUrl,
+                '1.2.3',
+                'experimentPath'
+            );
+            expect(resultPackage.installTestPath).toEqual(
+                `./experimentPath/1.2.3${pathSuffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}`
+            );
+        });
 
-            test(`Install test path is calculated using specified path, version and ends with correct binary - Linux(x64) useFramework: ${useFramework}`, () => {
-                const testPackage = inputPackages.find(
-                    (element) => element.platformId && element.platformId == 'linux-x64'
-                );
-                const resultPackage = SetBinaryAndGetPackage(
-                    testPackage!,
-                    useFramework,
-                    serverUrl,
-                    '1.2.3',
-                    'experimentPath'
-                );
-                resultPackage.installTestPath!.should.equal(
-                    `./experimentPath/1.2.3${pathSuffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
-                );
-            });
+        test(`Install test path is calculated using specified path, version and ends with correct binary - OSX ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
+            const testPackage = inputPackages.find((element) => element.platformId && element.platformId == 'osx');
+            const resultPackage = SetBinaryAndGetPackage(
+                testPackage!,
+                useFramework,
+                serverUrl,
+                '1.2.3',
+                'experimentPath'
+            );
+            expect(resultPackage.installTestPath).toEqual(
+                `./experimentPath/1.2.3${pathSuffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
+            );
         });
 
-        test('Download url is calculated using server url and version (useFramework: true)', () => {
+        test(`Install test path is calculated using specified path, version and ends with correct binary - Linux(x86) ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
             const testPackage = inputPackages.find(
-                (element) => element.platformId && element.platformId == 'os-architecture'
+                (element) => element.platformId && element.platformId == 'linux-x86'
             );
             const resultPackage = SetBinaryAndGetPackage(
                 testPackage!,
-                /* useFramework: */ true,
-                'http://someurl',
-                '1.1.1',
-                installPath
+                useFramework,
+                serverUrl,
+                '1.2.3',
+                'experimentPath'
+            );
+            expect(resultPackage.installTestPath).toEqual(
+                `./experimentPath/1.2.3${pathSuffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
             );
-            resultPackage.url.should.equal('http://someurl/releases/1.1.1/omnisharp-os-architecture.zip');
         });
 
-        test('Download url is calculated using server url and version (useFramework: false)', () => {
+        test(`Install test path is calculated using specified path, version and ends with correct binary - Linux(x64) useFramework: ${
+            useFramework ? 'on framework' : ''
+        }`, () => {
             const testPackage = inputPackages.find(
-                (element) => element.platformId && element.platformId == 'os-architecture'
+                (element) => element.platformId && element.platformId == 'linux-x64'
             );
             const resultPackage = SetBinaryAndGetPackage(
                 testPackage!,
-                /* useFramework: */ false,
-                'http://someurl',
-                '1.1.1',
-                installPath
+                useFramework,
+                serverUrl,
+                '1.2.3',
+                'experimentPath'
             );
-            resultPackage.url.should.equal(
-                `http://someurl/releases/1.1.1/omnisharp-os-architecture-net${modernNetVersion}.zip`
+            expect(resultPackage.installTestPath).toEqual(
+                `./experimentPath/1.2.3${pathSuffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
             );
         });
-    }
-);
+    });
+
+    test('Download url is calculated using server url and version on framework', () => {
+        const testPackage = inputPackages.find(
+            (element) => element.platformId && element.platformId == 'os-architecture'
+        );
+        const resultPackage = SetBinaryAndGetPackage(
+            testPackage!,
+            /* useFramework: */ true,
+            'http://someurl',
+            '1.1.1',
+            installPath
+        );
+        expect(resultPackage.url).toEqual('http://someurl/releases/1.1.1/omnisharp-os-architecture.zip');
+    });
+
+    test('Download url is calculated using server url and version (useFramework: false)', () => {
+        const testPackage = inputPackages.find(
+            (element) => element.platformId && element.platformId == 'os-architecture'
+        );
+        const resultPackage = SetBinaryAndGetPackage(
+            testPackage!,
+            /* useFramework: */ false,
+            'http://someurl',
+            '1.1.1',
+            installPath
+        );
+        expect(resultPackage.url).toEqual(
+            `http://someurl/releases/1.1.1/omnisharp-os-architecture-net${modernNetVersion}.zip`
+        );
+    });
+});
 
-suite('GetPackagesFromVersion : Gets the experimental omnisharp packages from a set of input packages', () => {
+describe('GetPackagesFromVersion : Gets the experimental omnisharp packages from a set of input packages', () => {
     const serverUrl = 'http://serverUrl';
     const installPath = 'testPath';
 
     [true, false].forEach((useFramework) => {
-        test('Returns experiment packages with install test path depending on install path and version', () => {
+        test(`Returns experiment packages with install test path depending on install path and version${
+            useFramework ? 'on framework' : ''
+        }`, () => {
             const inputPackages: Package[] = [
                 {
                     id: 'OmniSharp',
@@ -248,11 +244,11 @@ suite('GetPackagesFromVersion : Gets the experimental omnisharp packages from a
                 'experimentPath'
             );
             const suffix = useFramework ? '' : `-net${modernNetVersion}`;
-            outPackages.length.should.equal(2);
-            outPackages[0].installTestPath!.should.equal(
+            expect(outPackages).toHaveLength(2);
+            expect(outPackages[0].installTestPath).toEqual(
                 `./experimentPath/1.1.1${suffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}`
             );
-            outPackages[1].installTestPath!.should.equal(
+            expect(outPackages[1].installTestPath).toEqual(
                 `./experimentPath/1.1.1${suffix}/${useFramework ? 'run' : 'OmniSharp.dll'}`
             );
         });
@@ -298,9 +294,9 @@ suite('GetPackagesFromVersion : Gets the experimental omnisharp packages from a
             ];
 
             const outPackages = GetPackagesFromVersion(version, useFramework, inputPackages, serverUrl, installPath);
-            outPackages.length.should.equal(1);
-            outPackages[0].platformId!.should.equal('win-x64');
-            outPackages[0].isFramework!.should.equal(useFramework);
+            expect(outPackages).toHaveLength(1);
+            expect(outPackages[0].platformId).toEqual('win-x64');
+            expect(outPackages[0].isFramework).toEqual(useFramework);
         });
     });
 });
diff --git a/omnisharptest/omnisharpJestTests/optionChangeObserver.test.ts b/omnisharptest/omnisharpUnitTests/optionChangeObserver.test.ts
similarity index 95%
rename from omnisharptest/omnisharpJestTests/optionChangeObserver.test.ts
rename to omnisharptest/omnisharpUnitTests/optionChangeObserver.test.ts
index 5684fcb76..27f0f13ca 100644
--- a/omnisharptest/omnisharpJestTests/optionChangeObserver.test.ts
+++ b/omnisharptest/omnisharpUnitTests/optionChangeObserver.test.ts
@@ -5,7 +5,6 @@
 
 import { timeout } from 'rxjs/operators';
 import { from as observableFrom, Subject, BehaviorSubject } from 'rxjs';
-import { Options } from '../../src/shared/options';
 import { registerOmnisharpOptionChanges } from '../../src/omnisharp/omnisharpOptionChanges';
 
 import * as jestLib from '@jest/globals';
@@ -19,11 +18,11 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
     let commandDone: Promise<void> | undefined;
     let infoMessage: string | undefined;
     let invokedCommand: string | undefined;
-    let optionObservable: Subject<Options>;
+    let optionObservable: Subject<void>;
 
     jestLib.beforeEach(() => {
         resetMocks();
-        optionObservable = new BehaviorSubject<Options>(Options.Read(vscode));
+        optionObservable = new BehaviorSubject<void>(undefined);
         infoMessage = undefined;
         invokedCommand = undefined;
         commandDone = new Promise<void>((resolve) => {
@@ -46,7 +45,7 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
                 jestLib.expect(infoMessage).toBe(undefined);
                 jestLib.expect(invokedCommand).toBe(undefined);
                 updateConfig(vscode, elem.config, elem.section, elem.value);
-                optionObservable.next(Options.Read(vscode));
+                optionObservable.next();
             });
 
             jestLib.test(`The information message is shown`, async () => {
@@ -85,7 +84,7 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
                 jestLib.expect(infoMessage).toBe(undefined);
                 jestLib.expect(invokedCommand).toBe(undefined);
                 updateConfig(vscode, elem.config, elem.section, elem.value);
-                optionObservable.next(Options.Read(vscode));
+                optionObservable.next();
             });
 
             jestLib.test(`The information message is shown`, async () => {
@@ -132,7 +131,7 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
             jestLib.expect(infoMessage).toBe(undefined);
             jestLib.expect(invokedCommand).toBe(undefined);
             updateConfig(vscode, elem.config, elem.section, elem.value);
-            optionObservable.next(Options.Read(vscode));
+            optionObservable.next();
             jestLib.expect(infoMessage).toBe(undefined);
         });
     });
diff --git a/omnisharptest/omnisharpUnitTests/optionObserver/optionProvider.test.ts b/omnisharptest/omnisharpUnitTests/optionObserver/optionProvider.test.ts
deleted file mode 100644
index 288eae67d..000000000
--- a/omnisharptest/omnisharpUnitTests/optionObserver/optionProvider.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { should, expect } from 'chai';
-import { getVSCodeWithConfig, updateConfig } from '../../../test/unitTests/fakes';
-import { vscode } from '../../../src/vscodeAdapter';
-import OptionProvider from '../../../src/shared/observers/optionProvider';
-import { Subject } from 'rxjs';
-import { Options } from '../../../src/shared/options';
-
-suite('OptionProvider', () => {
-    suiteSetup(() => should());
-
-    let vscode: vscode;
-    let optionProvider: OptionProvider;
-    let optionObservable: Subject<Options>;
-
-    setup(() => {
-        vscode = getVSCodeWithConfig();
-        optionObservable = new Subject<Options>();
-        optionProvider = new OptionProvider(optionObservable);
-    });
-
-    test('Throws exception when no options are pushed', () => {
-        expect(optionProvider.GetLatestOptions).to.throw();
-    });
-
-    test('Gives the latest options when options are changed', () => {
-        const changingConfig = 'omnisharp';
-        updateConfig(vscode, changingConfig, 'path', 'somePath');
-        optionObservable.next(Options.Read(vscode));
-        updateConfig(vscode, changingConfig, 'path', 'anotherPath');
-        optionObservable.next(Options.Read(vscode));
-        const options = optionProvider.GetLatestOptions();
-        expect(options.commonOptions.serverPath).to.be.equal('anotherPath');
-    });
-});
diff --git a/omnisharptest/omnisharpUnitTests/optionStream.test.ts b/omnisharptest/omnisharpUnitTests/optionStream.test.ts
index f861f0c99..21923dbe7 100644
--- a/omnisharptest/omnisharpUnitTests/optionStream.test.ts
+++ b/omnisharptest/omnisharpUnitTests/optionStream.test.ts
@@ -3,64 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should } from 'chai';
-import { ConfigurationChangeEvent, vscode } from '../../src/vscodeAdapter';
-import { getVSCodeWithConfig, updateConfig } from '../../test/unitTests/fakes';
-import Disposable from '../../src/disposable';
-import { Observable, Subscription } from 'rxjs';
-import { Options } from '../../src/shared/options';
-import { GetConfigChangeEvent } from './testAssets/getConfigChangeEvent';
+import * as vscode from 'vscode';
+import { jest, describe, test, expect, beforeEach } from '@jest/globals';
+import { Observable } from 'rxjs';
 import createOptionStream from '../../src/shared/observables/createOptionStream';
+import Disposable from '../../src/disposable';
 
-suite('OptionStream', () => {
-    suiteSetup(() => should());
-
-    let listenerFunction: Array<(e: ConfigurationChangeEvent) => any>;
-    let vscode: vscode;
-    let optionStream: Observable<Options>;
+describe('OptionStream', () => {
+    let listenerFunction: Array<(e: vscode.ConfigurationChangeEvent) => any>;
+    let optionStream: Observable<void>;
     let disposeCalled: boolean;
 
-    setup(() => {
-        listenerFunction = new Array<(e: ConfigurationChangeEvent) => any>();
-        vscode = getVSCode(listenerFunction);
+    beforeEach(() => {
+        listenerFunction = new Array<(e: vscode.ConfigurationChangeEvent) => any>();
+        jest.spyOn(vscode.workspace, 'onDidChangeConfiguration').mockImplementation(
+            (
+                listener: (e: vscode.ConfigurationChangeEvent) => any,
+                _thisArgs?: any,
+                _disposables?: vscode.Disposable[]
+            ) => {
+                listenerFunction.push(listener);
+                return new Disposable(() => (disposeCalled = true));
+            }
+        );
+
         optionStream = createOptionStream(vscode);
         disposeCalled = false;
     });
 
-    suite('Returns the recent options to the subscriber', () => {
-        let subscription: Subscription;
-        let options: Options;
-
-        setup(() => {
-            subscription = optionStream.subscribe((newOptions) => (options = newOptions));
-        });
-
-        test('Gives the changed option when the omnisharp config changes', () => {
-            options.commonOptions.serverPath.should.equal('');
-            const changingConfig = 'omnisharp';
-            updateConfig(vscode, changingConfig, 'path', 'somePath');
-            listenerFunction.forEach((listener) => listener(GetConfigChangeEvent(changingConfig)));
-            options.commonOptions.serverPath.should.equal('somePath');
-        });
-
-        test('Gives the changed option when the csharp config changes', () => {
-            options.omnisharpOptions.disableCodeActions.should.equal(false);
-            const changingConfig = 'csharp';
-            updateConfig(vscode, changingConfig, 'disableCodeActions', true);
-            listenerFunction.forEach((listener) => listener(GetConfigChangeEvent(changingConfig)));
-            options.omnisharpOptions.disableCodeActions.should.equal(true);
-        });
-
-        teardown(() => {
-            options = undefined!;
-            listenerFunction = undefined!;
-            subscription.unsubscribe();
-            subscription = undefined!;
-        });
-    });
-
     test('Dispose is called when the last subscriber unsubscribes', () => {
-        disposeCalled.should.equal(false);
+        expect(disposeCalled).toEqual(false);
         const subscription1 = optionStream.subscribe((_) => {
             /** empty */
         });
@@ -71,26 +43,10 @@ suite('OptionStream', () => {
             /** empty */
         });
         subscription1.unsubscribe();
-        disposeCalled.should.equal(false);
+        expect(disposeCalled).toEqual(false);
         subscription2.unsubscribe();
-        disposeCalled.should.equal(false);
+        expect(disposeCalled).toEqual(false);
         subscription3.unsubscribe();
-        disposeCalled.should.equal(true);
+        expect(disposeCalled).toEqual(true);
     });
-
-    function getVSCode(listenerFunction: Array<(e: ConfigurationChangeEvent) => any>): vscode {
-        const vscode = getVSCodeWithConfig();
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        vscode.workspace.onDidChangeConfiguration = (
-            listener: (e: ConfigurationChangeEvent) => any,
-            _thisArgs?: any,
-            _disposables?: Disposable[]
-        ) => {
-            listenerFunction.push(listener);
-            return new Disposable(() => (disposeCalled = true));
-        };
-
-        return vscode;
-    }
 });
diff --git a/omnisharptest/omnisharpUnitTests/options.test.ts b/omnisharptest/omnisharpUnitTests/options.test.ts
index 1d7e37e48..203168696 100644
--- a/omnisharptest/omnisharpUnitTests/options.test.ts
+++ b/omnisharptest/omnisharpUnitTests/options.test.ts
@@ -3,133 +3,101 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should, expect } from 'chai';
-import { Options } from '../../src/shared/options';
-import { getVSCodeWithConfig, updateConfig } from '../../test/unitTests/fakes';
+import * as vscode from 'vscode';
+import { jest, describe, test, expect, beforeEach } from '@jest/globals';
 import { URI } from 'vscode-uri';
 import * as path from 'path';
+import { commonOptions, omnisharpOptions } from '../../src/shared/options';
+import { getWorkspaceConfiguration } from '../../test/unitTests/fakes';
 
-suite('Options tests', () => {
-    suiteSetup(() => should());
-
+describe('Options tests', () => {
+    beforeEach(() => {
+        jest.spyOn(vscode.workspace, 'getConfiguration').mockReturnValue(getWorkspaceConfiguration());
+    });
     test('Verify defaults', () => {
-        const vscode = getVSCodeWithConfig();
-        const options = Options.Read(vscode);
-        options.commonOptions.serverPath.should.equal('');
-        options.omnisharpOptions.monoPath.should.equal('');
-        options.commonOptions.defaultSolution.should.equal('');
-        options.commonOptions.waitForDebugger.should.equal(false);
-        options.omnisharpOptions.loggingLevel.should.equal('information');
-        options.omnisharpOptions.autoStart.should.equal(true);
-        options.omnisharpOptions.projectLoadTimeout.should.equal(60);
-        options.omnisharpOptions.maxProjectResults.should.equal(250);
-        options.omnisharpOptions.useEditorFormattingSettings.should.equal(true);
-        options.omnisharpOptions.useFormatting.should.equal(true);
-        options.omnisharpOptions.showReferencesCodeLens.should.equal(true);
-        options.omnisharpOptions.showTestsCodeLens.should.equal(true);
-        options.omnisharpOptions.disableCodeActions.should.equal(false);
-        options.omnisharpOptions.showOmnisharpLogOnError.should.equal(true);
-        options.omnisharpOptions.minFindSymbolsFilterLength.should.equal(0);
-        options.omnisharpOptions.maxFindSymbolsItems.should.equal(1000);
-        options.omnisharpOptions.enableMsBuildLoadProjectsOnDemand.should.equal(false);
-        options.omnisharpOptions.enableRoslynAnalyzers.should.equal(true);
-        options.omnisharpOptions.enableEditorConfigSupport.should.equal(true);
-        options.omnisharpOptions.enableDecompilationSupport.should.equal(false);
-        options.omnisharpOptions.enableImportCompletion.should.equal(false);
-        options.omnisharpOptions.enableAsyncCompletion.should.equal(false);
-        options.omnisharpOptions.analyzeOpenDocumentsOnly.should.equal(true);
-        options.omnisharpOptions.testRunSettings.should.equal('');
+        expect(commonOptions.serverPath).toEqual('');
+        expect(omnisharpOptions.monoPath).toEqual('');
+        expect(commonOptions.defaultSolution).toEqual('');
+        expect(commonOptions.waitForDebugger).toEqual(false);
+        expect(omnisharpOptions.loggingLevel).toEqual('information');
+        expect(omnisharpOptions.autoStart).toEqual(true);
+        expect(omnisharpOptions.projectLoadTimeout).toEqual(60);
+        expect(omnisharpOptions.maxProjectResults).toEqual(250);
+        expect(omnisharpOptions.useEditorFormattingSettings).toEqual(true);
+        expect(omnisharpOptions.useFormatting).toEqual(true);
+        expect(omnisharpOptions.showReferencesCodeLens).toEqual(true);
+        expect(omnisharpOptions.showTestsCodeLens).toEqual(true);
+        expect(omnisharpOptions.disableCodeActions).toEqual(false);
+        expect(omnisharpOptions.showOmnisharpLogOnError).toEqual(true);
+        expect(omnisharpOptions.minFindSymbolsFilterLength).toEqual(0);
+        expect(omnisharpOptions.maxFindSymbolsItems).toEqual(1000);
+        expect(omnisharpOptions.enableMsBuildLoadProjectsOnDemand).toEqual(false);
+        expect(omnisharpOptions.enableRoslynAnalyzers).toEqual(true);
+        expect(omnisharpOptions.enableEditorConfigSupport).toEqual(true);
+        expect(omnisharpOptions.enableDecompilationSupport).toEqual(false);
+        expect(omnisharpOptions.enableImportCompletion).toEqual(false);
+        expect(omnisharpOptions.enableAsyncCompletion).toEqual(false);
+        expect(omnisharpOptions.analyzeOpenDocumentsOnly).toEqual(true);
+        expect(commonOptions.runSettingsPath).toEqual('');
     });
 
     test('Verify return no excluded paths when files.exclude empty', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, undefined, 'files.exclude', {});
+        vscode.workspace.getConfiguration().update('files.exclude', {});
 
-        const excludedPaths = Options.getExcludedPaths(vscode);
-        expect(excludedPaths).to.be.empty;
+        const excludedPaths = commonOptions.excludePaths;
+        expect(excludedPaths).toHaveLength(0);
     });
 
     test('Verify return excluded paths when files.exclude populated', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, undefined, 'files.exclude', { '**/node_modules': true, '**/assets': false });
+        vscode.workspace.getConfiguration().update('files.exclude', { '**/node_modules': true, '**/assets': false });
 
-        const excludedPaths = Options.getExcludedPaths(vscode);
-        excludedPaths.should.deep.equal(['**/node_modules']);
+        const excludedPaths = commonOptions.excludePaths;
+        expect(excludedPaths).toStrictEqual(['**/node_modules']);
     });
 
     test('Verify return no excluded paths when files.exclude and search.exclude empty', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, undefined, 'files.exclude', {});
-        updateConfig(vscode, undefined, 'search.exclude', {});
-
-        const excludedPaths = Options.getExcludedPaths(vscode, true);
-        expect(excludedPaths).to.be.empty;
-    });
-
-    test('Verify return excluded paths when files.exclude and search.exclude populated', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, undefined, 'files.exclude', { '/Library': true });
-        updateConfig(vscode, undefined, 'search.exclude', { '**/node_modules': true, '**/assets': false });
+        vscode.workspace.getConfiguration().update('files.exclude', {});
+        vscode.workspace.getConfiguration().update('search.exclude', {});
 
-        const excludedPaths = Options.getExcludedPaths(vscode, true);
-        excludedPaths.should.deep.equal(['/Library', '**/node_modules']);
+        const excludedPaths = commonOptions.excludePaths;
+        expect(excludedPaths).toHaveLength(0);
     });
 
     test('BACK-COMPAT: "omnisharp.loggingLevel": "verbose" == "omnisharp.loggingLevel": "debug"', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, 'omnisharp', 'loggingLevel', 'verbose');
+        vscode.workspace.getConfiguration().update('omnisharp.loggingLevel', 'verbose');
 
-        const options = Options.Read(vscode);
-
-        options.omnisharpOptions.loggingLevel.should.equal('debug');
+        expect(omnisharpOptions.loggingLevel).toEqual('debug');
     });
 
     test('BACK-COMPAT: "csharp.omnisharp" is used if it is set and "omnisharp.path" is not', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, 'csharp', 'omnisharp', 'OldPath');
-
-        const options = Options.Read(vscode);
+        vscode.workspace.getConfiguration().update('csharp.omnisharp', 'OldPath');
 
-        options.commonOptions.serverPath.should.equal('OldPath');
+        expect(commonOptions.serverPath).toEqual('OldPath');
     });
 
     test('BACK-COMPAT: "csharp.omnisharp" is not used if "omnisharp.path" is set', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(vscode, 'omnisharp', 'path', 'NewPath');
-        updateConfig(vscode, 'csharp', 'omnisharp', 'OldPath');
-
-        const options = Options.Read(vscode);
+        vscode.workspace.getConfiguration().update('omnisharp.path', 'NewPath');
+        vscode.workspace.getConfiguration().update('csharp.omnisharp', 'OldPath');
 
-        options.commonOptions.serverPath.should.equal('NewPath');
+        expect(commonOptions.serverPath).toEqual('NewPath');
     });
 
     test('"omnisharp.defaultLaunchSolution" is used if set', () => {
-        const vscode = getVSCodeWithConfig();
         const workspaceFolderUri = URI.file('/Test');
-        vscode.workspace.workspaceFolders = [{ index: 0, name: 'Test', uri: workspaceFolderUri }];
+        jest.replaceProperty(vscode.workspace, 'workspaceFolders', [
+            { index: 0, name: 'Test', uri: workspaceFolderUri },
+        ]);
 
-        updateConfig(vscode, 'omnisharp', 'defaultLaunchSolution', 'some_valid_solution.sln');
+        vscode.workspace.getConfiguration().update('omnisharp.defaultLaunchSolution', 'some_valid_solution.sln');
 
-        const options = Options.Read(vscode);
-
-        options.commonOptions.defaultSolution.should.equals(
-            path.join(workspaceFolderUri.fsPath, 'some_valid_solution.sln')
-        );
+        expect(commonOptions.defaultSolution).toEqual(path.join(workspaceFolderUri.fsPath, 'some_valid_solution.sln'));
     });
 
     test('"omnisharp.testRunSettings" is used if set', () => {
-        const vscode = getVSCodeWithConfig();
-        updateConfig(
-            vscode,
-            'omnisharp',
-            'testRunSettings',
-            'some_valid_path\\some_valid_runsettings_files.runsettings'
-        );
-
-        const options = Options.Read(vscode);
-
-        options.omnisharpOptions.testRunSettings.should.equal(
-            'some_valid_path\\some_valid_runsettings_files.runsettings'
-        );
+        vscode.workspace
+            .getConfiguration()
+            .update('omnisharp.testRunSettings', 'some_valid_path\\some_valid_runsettings_files.runsettings');
+
+        expect(commonOptions.runSettingsPath).toEqual('some_valid_path\\some_valid_runsettings_files.runsettings');
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/packages/downloadAndInstallPackages.test.ts b/omnisharptest/omnisharpUnitTests/packages/downloadAndInstallPackages.test.ts
index 2787f034e..6468a0f6e 100644
--- a/omnisharptest/omnisharpUnitTests/packages/downloadAndInstallPackages.test.ts
+++ b/omnisharptest/omnisharpUnitTests/packages/downloadAndInstallPackages.test.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
 import * as path from 'path';
-import * as chaiAsPromised from 'chai-as-promised';
-import * as chai from 'chai';
 import * as util from '../../../src/common';
 import { CreateTmpDir, TmpAsset } from '../../../src/createTmpAsset';
-import TestZip from '../testAssets/testZip';
+import TestZip from '../../omnisharpUnitTests/testAssets/testZip';
 import { downloadAndInstallPackages } from '../../../src/packageManager/downloadAndInstallPackages';
 import NetworkSettings from '../../../src/networkSettings';
 import { EventStream } from '../../../src/eventStream';
@@ -23,17 +22,14 @@ import {
     DownloadFailure,
     InstallationFailure,
 } from '../../../src/omnisharp/loggingEvents';
-import MockHttpsServer from '../testAssets/mockHttpsServer';
-import { createTestFile } from '../testAssets/testFile';
-import TestEventBus from '../testAssets/testEventBus';
+import MockHttpsServer from '../../omnisharpUnitTests/testAssets/mockHttpsServer';
+import { createTestFile } from '../../omnisharpUnitTests/testAssets/testFile';
+import TestEventBus from '../../omnisharpUnitTests/testAssets/testEventBus';
 import { AbsolutePathPackage } from '../../../src/packageManager/absolutePathPackage';
 import { AbsolutePath } from '../../../src/packageManager/absolutePath';
 import { DownloadValidator } from '../../../src/packageManager/isValidDownload';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
-suite(`${downloadAndInstallPackages.name}`, () => {
+describe(`${downloadAndInstallPackages.name}`, () => {
     let tmpInstallDir: TmpAsset;
     let server: MockHttpsServer;
     let testZip: TestZip;
@@ -47,7 +43,7 @@ suite(`${downloadAndInstallPackages.name}`, () => {
     const packageDescription = 'Test Package';
     const networkSettingsProvider = () => new NetworkSettings('', false);
 
-    setup(async () => {
+    beforeEach(async () => {
         eventStream = new EventStream();
         server = await MockHttpsServer.CreateMockHttpsServer();
         eventBus = new TestEventBus(eventStream);
@@ -85,7 +81,7 @@ suite(`${downloadAndInstallPackages.name}`, () => {
         server.addRequestHandler('GET', '/notDownloadablePackage', 404);
     });
 
-    suite('If the download and install succeeds', () => {
+    describe('If the download and install succeeds', () => {
         test('The expected files are installed at the specified path', async () => {
             await downloadAndInstallPackages(
                 downloadablePackage,
@@ -95,7 +91,7 @@ suite(`${downloadAndInstallPackages.name}`, () => {
             );
             for (const elem of testZip.files) {
                 const filePath = path.join(tmpDirPath, elem.path);
-                expect(await util.fileExists(filePath)).to.be.true;
+                expect(await util.fileExists(filePath)).toBe(true);
             }
         });
 
@@ -106,7 +102,7 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 eventStream,
                 downloadValidator
             );
-            expect(await util.fileExists(path.join(tmpDirPath, 'install.Lock'))).to.be.true;
+            expect(await util.fileExists(path.join(tmpDirPath, 'install.Lock'))).toBe(true);
         });
 
         test('Events are created in the correct order', async () => {
@@ -125,7 +121,7 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 eventStream,
                 downloadValidator
             );
-            expect(eventBus.getEvents()).to.be.deep.equal(eventsSequence);
+            expect(eventBus.getEvents()).toStrictEqual(eventsSequence);
         });
 
         test('If the download validation fails for the first time and passed second time, the correct events are logged', async () => {
@@ -159,11 +155,11 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 eventStream,
                 downloadValidator
             );
-            expect(eventBus.getEvents()).to.be.deep.equal(eventsSequence);
+            expect(eventBus.getEvents()).toStrictEqual(eventsSequence);
         });
     });
 
-    suite('If the download and install fails', () => {
+    describe('If the download and install fails', () => {
         test('If the download succeeds but the validation fails, events are logged', async () => {
             const downloadValidator = () => false;
             const eventsSequence = [
@@ -186,7 +182,7 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 eventStream,
                 downloadValidator
             );
-            expect(eventBus.getEvents()).to.be.deep.equal(eventsSequence);
+            expect(eventBus.getEvents()).toStrictEqual(eventsSequence);
         });
 
         test('Returns false when the download fails', async () => {
@@ -203,12 +199,12 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 downloadValidator
             );
             const obtainedEvents = eventBus.getEvents();
-            expect(obtainedEvents[0]).to.be.deep.equal(eventsSequence[0]);
-            expect(obtainedEvents[1]).to.be.deep.equal(eventsSequence[1]);
-            expect(obtainedEvents[2]).to.be.deep.equal(eventsSequence[2]);
+            expect(obtainedEvents[0]).toStrictEqual(eventsSequence[0]);
+            expect(obtainedEvents[1]).toStrictEqual(eventsSequence[1]);
+            expect(obtainedEvents[2]).toStrictEqual(eventsSequence[2]);
             const installationFailureEvent = <InstallationFailure>obtainedEvents[3];
-            expect(installationFailureEvent.stage).to.be.equal('downloadPackage');
-            expect(installationFailureEvent.error).to.not.be.null;
+            expect(installationFailureEvent.stage).toEqual('downloadPackage');
+            expect(installationFailureEvent.error).not.toBe(null);
         });
 
         test('install.Lock is not present when the download fails', async () => {
@@ -218,11 +214,11 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 eventStream,
                 downloadValidator
             );
-            expect(await util.fileExists(path.join(tmpDirPath, 'install.Lock'))).to.be.false;
+            expect(await util.fileExists(path.join(tmpDirPath, 'install.Lock'))).toBe(false);
         });
     });
 
-    teardown(async () => {
+    afterEach(async () => {
         if (tmpInstallDir) {
             tmpInstallDir.dispose();
         }
diff --git a/omnisharptest/omnisharpUnitTests/packages/fileDownloader.test.ts b/omnisharptest/omnisharpUnitTests/packages/fileDownloader.test.ts
index b239e1ae7..852f1c0a1 100644
--- a/omnisharptest/omnisharpUnitTests/packages/fileDownloader.test.ts
+++ b/omnisharptest/omnisharpUnitTests/packages/fileDownloader.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as chai from 'chai';
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
 import { EventStream } from '../../../src/eventStream';
 import { DownloadFile } from '../../../src/packageManager/fileDownloader';
 import NetworkSettings from '../../../src/networkSettings';
@@ -15,12 +15,10 @@ import {
     DownloadFallBack,
     DownloadFailure,
 } from '../../../src/omnisharp/loggingEvents';
-import MockHttpsServer from '../testAssets/mockHttpsServer';
-import TestEventBus from '../testAssets/testEventBus';
+import MockHttpsServer from '../../omnisharpUnitTests/testAssets/mockHttpsServer';
+import TestEventBus from '../../omnisharpUnitTests/testAssets/testEventBus';
 
-const expect = chai.expect;
-
-suite('FileDownloader', () => {
+describe('FileDownloader', () => {
     const fileDescription = 'Test file';
     const correctUrlPath = `/resource`;
     const redirectUrlPath = '/redirectResource';
@@ -50,7 +48,7 @@ suite('FileDownloader', () => {
 
     let server: MockHttpsServer;
 
-    setup(async () => {
+    beforeEach(async () => {
         server = await MockHttpsServer.CreateMockHttpsServer();
         await server.start();
         eventBus = new TestEventBus(eventStream);
@@ -59,7 +57,7 @@ suite('FileDownloader', () => {
         server.addRequestHandler('GET', redirectUrlPath, 301, { location: `${server.baseUrl}${correctUrlPath}` });
     });
 
-    suite('If the response status Code is 200, the download succeeds', () => {
+    describe('If the response status Code is 200, the download succeeds', () => {
         [
             {
                 description: 'Primary url',
@@ -74,7 +72,7 @@ suite('FileDownloader', () => {
                 getEventSequence: getFallBackURLEvents,
             },
         ].forEach((elem) => {
-            suite(elem.description, () => {
+            describe(elem.description, () => {
                 test('File is downloaded', async () => {
                     const buffer = await DownloadFile(
                         fileDescription,
@@ -84,7 +82,7 @@ suite('FileDownloader', () => {
                         getURL(elem.fallBackUrlPath)
                     );
                     const text = buffer.toString('utf8');
-                    expect(text).to.be.equal('Test content');
+                    expect(text).toEqual('Test content');
                 });
 
                 test('Events are created in the correct order', async () => {
@@ -95,13 +93,13 @@ suite('FileDownloader', () => {
                         getURL(elem.urlPath),
                         getURL(elem.fallBackUrlPath)
                     );
-                    expect(eventBus.getEvents()).to.be.deep.equal(elem.getEventSequence());
+                    expect(eventBus.getEvents()).toStrictEqual(elem.getEventSequence());
                 });
             });
         });
     });
 
-    suite('If the response status Code is 301, redirect occurs and the download succeeds', () => {
+    describe('If the response status Code is 301, redirect occurs and the download succeeds', () => {
         test('File is downloaded from the redirect url', async () => {
             const buffer = await DownloadFile(
                 fileDescription,
@@ -110,11 +108,11 @@ suite('FileDownloader', () => {
                 getURL(redirectUrlPath)
             );
             const text = buffer.toString('utf8');
-            expect(text).to.be.equal('Test content');
+            expect(text).toEqual('Test content');
         });
     });
 
-    suite('If the response status code is not 301, 302 or 200 then the download fails', () => {
+    describe('If the response status code is not 301, 302 or 200 then the download fails', () => {
         test('Error is thrown', async () => {
             const downloadPromise = DownloadFile(
                 fileDescription,
@@ -127,7 +125,7 @@ suite('FileDownloader', () => {
             } catch {
                 /* empty */
             }
-            expect(downloadPromise).be.rejected;
+            expect(downloadPromise).rejects.toThrow();
         });
 
         test('Download Start and Download Failure events are created', async () => {
@@ -138,12 +136,12 @@ suite('FileDownloader', () => {
             try {
                 await DownloadFile(fileDescription, eventStream, networkSettingsProvider, getURL(errorUrlPath));
             } catch (error) {
-                expect(eventBus.getEvents()).to.be.deep.equal(eventsSequence);
+                expect(eventBus.getEvents()).toStrictEqual(eventsSequence);
             }
         });
     });
 
-    teardown(async () => {
+    afterEach(async () => {
         await server.stop();
         eventBus.dispose();
     });
diff --git a/omnisharptest/omnisharpUnitTests/packages/isValidDownload.test.ts b/omnisharptest/omnisharpUnitTests/packages/isValidDownload.test.ts
index d2186d873..21430cf2c 100644
--- a/omnisharptest/omnisharpUnitTests/packages/isValidDownload.test.ts
+++ b/omnisharptest/omnisharpUnitTests/packages/isValidDownload.test.ts
@@ -3,29 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect } from '@jest/globals';
 import { isValidDownload } from '../../../src/packageManager/isValidDownload';
-import * as chai from 'chai';
 import { EventStream } from '../../../src/eventStream';
 
-chai.should();
-const expect = chai.expect;
-
-suite(`${isValidDownload.name}`, () => {
+describe(`${isValidDownload.name}`, () => {
     const sampleBuffer = Buffer.from('sampleBuffer');
     const validIntegrity = 'eb7201b5d986919e0ac67c820886358869d8f7059193d33c902ad7fe1688e1e9';
 
     test('Returns false for non-matching integrity', async () => {
         const result = await isValidDownload(sampleBuffer, 'inValidIntegrity', new EventStream());
-        expect(result).to.be.false;
+        expect(result).toBe(false);
     });
 
     test('Returns true for matching integrity', async () => {
         const result = await isValidDownload(sampleBuffer, validIntegrity, new EventStream());
-        expect(result).to.be.true;
+        expect(result).toBe(true);
     });
 
     test('Returns true if no integrity has been specified', async () => {
         const result = await isValidDownload(sampleBuffer, undefined, new EventStream());
-        expect(result).to.be.true;
+        expect(result).toBe(true);
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/packages/packageFilterer.test.ts b/omnisharptest/omnisharpUnitTests/packages/packageFilterer.test.ts
index c576a4510..a65405ce9 100644
--- a/omnisharptest/omnisharpUnitTests/packages/packageFilterer.test.ts
+++ b/omnisharptest/omnisharpUnitTests/packages/packageFilterer.test.ts
@@ -2,19 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as chai from 'chai';
+import { describe, test, expect, beforeEach, jest } from '@jest/globals';
 import { PlatformInformation } from '../../../src/shared/platform';
 import { getNotInstalledPackagesForPlatform } from '../../../src/packageManager/packageFilterer';
 import { Package } from '../../../src/packageManager/package';
 import { AbsolutePathPackage } from '../../../src/packageManager/absolutePathPackage';
+import { MockedFunction } from 'jest-mock';
+import * as fs from 'fs';
 import { join } from 'path';
 
-const expect = chai.expect;
-// There are no typings for this library.
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const mock = require('mock-fs');
-
-suite(`${getNotInstalledPackagesForPlatform.name}`, () => {
+describe(`${getNotInstalledPackagesForPlatform.name}`, () => {
     let absolutePathPackages: AbsolutePathPackage[];
     const extensionPath = '/ExtensionPath';
     const packages = <Package[]>[
@@ -57,34 +54,40 @@ suite(`${getNotInstalledPackagesForPlatform.name}`, () => {
         },
     ];
 
-    setup(async () => {
+    beforeEach(async () => {
         absolutePathPackages = packages.map((pkg) => AbsolutePathPackage.getAbsolutePathPackage(pkg, extensionPath));
         const installLockPath = join(absolutePathPackages[1].installPath.value, 'install.Lock');
         //mock the install lock path so the package should be filtered
-        mock({
-            [installLockPath]: 'no content',
+        const statSpy = jest.spyOn(fs, 'stat') as unknown as MockedFunction<
+            (
+                path: fs.PathLike,
+                callback: (err: NodeJS.ErrnoException | null, stats: fs.Stats | undefined) => void
+            ) => void
+        >;
+        statSpy.mockImplementation((path, callback) => {
+            if (installLockPath === path) {
+                callback(null, { isFile: () => true } as unknown as fs.Stats);
+            } else {
+                callback(null, undefined);
+            }
         });
     });
 
     test('Filters the packages based on Platform Information', async () => {
         const platformInfo = new PlatformInformation('win32', 'architecture2');
         const filteredPackages = await getNotInstalledPackagesForPlatform(absolutePathPackages, platformInfo);
-        expect(filteredPackages.length).to.be.equal(1);
-        expect(filteredPackages[0].description).to.be.equal('win32-Architecture2 uninstalled package');
-        expect(filteredPackages[0].platforms[0]).to.be.equal('win32');
-        expect(filteredPackages[0].architectures[0]).to.be.equal('architecture2');
+        expect(filteredPackages.length).toEqual(1);
+        expect(filteredPackages[0].description).toEqual('win32-Architecture2 uninstalled package');
+        expect(filteredPackages[0].platforms[0]).toEqual('win32');
+        expect(filteredPackages[0].architectures[0]).toEqual('architecture2');
     });
 
     test('Returns only the packages where install.Lock is not present', async () => {
         const platformInfo = new PlatformInformation('linux', 'architecture1');
         const filteredPackages = await getNotInstalledPackagesForPlatform(absolutePathPackages, platformInfo);
-        expect(filteredPackages.length).to.be.equal(1);
-        expect(filteredPackages[0].description).to.be.equal('linux-Architecture1 uninstalled package');
-        expect(filteredPackages[0].platforms[0]).to.be.equal('linux');
-        expect(filteredPackages[0].architectures[0]).to.be.equal('architecture1');
-    });
-
-    teardown(() => {
-        mock.restore();
+        expect(filteredPackages.length).toEqual(1);
+        expect(filteredPackages[0].description).toEqual('linux-Architecture1 uninstalled package');
+        expect(filteredPackages[0].platforms[0]).toEqual('linux');
+        expect(filteredPackages[0].architectures[0]).toEqual('architecture1');
     });
 });
diff --git a/omnisharptest/omnisharpUnitTests/packages/zipInstaller.test.ts b/omnisharptest/omnisharpUnitTests/packages/zipInstaller.test.ts
index 908e18f5f..66be19b33 100644
--- a/omnisharptest/omnisharpUnitTests/packages/zipInstaller.test.ts
+++ b/omnisharptest/omnisharpUnitTests/packages/zipInstaller.test.ts
@@ -3,23 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
 import * as fs from 'async-file';
 import * as path from 'path';
-import * as chai from 'chai';
 import * as util from '../../../src/common';
 import { CreateTmpDir, TmpAsset } from '../../../src/createTmpAsset';
 import { InstallZip } from '../../../src/packageManager/zipInstaller';
 import { EventStream } from '../../../src/eventStream';
 import { PlatformInformation } from '../../../src/shared/platform';
 import { BaseEvent, InstallationStart, ZipError } from '../../../src/omnisharp/loggingEvents';
-import { createTestFile } from '../testAssets/testFile';
-import TestZip from '../testAssets/testZip';
-import TestEventBus from '../testAssets/testEventBus';
+import { createTestFile } from '../../omnisharpUnitTests/testAssets/testFile';
+import TestZip from '../../omnisharpUnitTests/testAssets/testZip';
+import TestEventBus from '../../omnisharpUnitTests/testAssets/testEventBus';
 import { AbsolutePath } from '../../../src/packageManager/absolutePath';
 
-const expect = chai.expect;
-
-suite('ZipInstaller', () => {
+describe('ZipInstaller', () => {
     const binaries = [createTestFile('binary1', 'binary1.txt'), createTestFile('binary2', 'binary2.txt')];
 
     const files = [createTestFile('file1', 'file1.txt'), createTestFile('file2', 'folder/file2.txt')];
@@ -31,7 +29,7 @@ suite('ZipInstaller', () => {
     let eventStream: EventStream;
     let eventBus: TestEventBus;
 
-    setup(async () => {
+    beforeEach(async () => {
         eventStream = new EventStream();
         eventBus = new TestEventBus(eventStream);
         tmpInstallDir = await CreateTmpDir(true);
@@ -44,14 +42,14 @@ suite('ZipInstaller', () => {
         await InstallZip(testZip.buffer, fileDescription, installationPath, [], eventStream);
         for (const elem of testZip.files) {
             const filePath = path.join(installationPath.value, elem.path);
-            expect(await util.fileExists(filePath)).to.be.true;
+            expect(await util.fileExists(filePath)).toBe(true);
         }
     });
 
     test('The folder is unzipped and all the expected events are created', async () => {
         await InstallZip(testZip.buffer, fileDescription, installationPath, [], eventStream);
         const eventSequence: BaseEvent[] = [new InstallationStart(fileDescription)];
-        expect(eventBus.getEvents()).to.be.deep.equal(eventSequence);
+        expect(eventBus.getEvents()).toStrictEqual(eventSequence);
     });
 
     test('The folder is unzipped and the binaries have the expected permissions(except on Windows)', async () => {
@@ -61,16 +59,17 @@ suite('ZipInstaller', () => {
             );
             await InstallZip(testZip.buffer, fileDescription, installationPath, absoluteBinaries, eventStream);
             for (const binaryPath of absoluteBinaries) {
-                expect(await util.fileExists(binaryPath.value)).to.be.true;
+                expect(await util.fileExists(binaryPath.value)).toBe(true);
                 const mode = (await fs.stat(binaryPath.value)).mode;
-                expect(mode & 0o7777).to.be.equal(0o755, `Expected mode for path ${binaryPath}`);
+                expect(mode & 0o7777).toEqual(0o755);
             }
         }
     });
 
     test('Error is thrown when the buffer contains an invalid zip', async () => {
-        expect(InstallZip(Buffer.from('My file', 'utf8'), 'Text File', installationPath, [], eventStream)).to.be
-            .rejected;
+        expect(
+            InstallZip(Buffer.from('My file', 'utf8'), 'Text File', installationPath, [], eventStream)
+        ).rejects.toThrow();
     });
 
     test('Error event is created when the buffer contains an invalid zip', async () => {
@@ -83,11 +82,11 @@ suite('ZipInstaller', () => {
                     'C# Extension was unable to download its dependencies. Please check your internet connection. If you use a proxy server, please visit https://aka.ms/VsCodeCsharpNetworking'
                 ),
             ];
-            expect(eventBus.getEvents()).to.be.deep.equal(eventSequence);
+            expect(eventBus.getEvents()).toStrictEqual(eventSequence);
         }
     });
 
-    teardown(async () => {
+    afterEach(async () => {
         if (tmpInstallDir) {
             tmpInstallDir.dispose();
         }
diff --git a/omnisharptest/omnisharpUnitTests/platform.test.ts b/omnisharptest/omnisharpUnitTests/platform.test.ts
index c677b53a9..ed0385192 100644
--- a/omnisharptest/omnisharpUnitTests/platform.test.ts
+++ b/omnisharptest/omnisharpUnitTests/platform.test.ts
@@ -3,38 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { describe, test, expect } from '@jest/globals';
 import { LinuxDistribution } from '../../src/shared/platform';
-import { should } from 'chai';
-
-suite('Platform', () => {
-    suiteSetup(() => should());
 
+describe('Platform', () => {
     test('Retrieve correct information for Ubuntu 14.04', () => {
         const dist = distro_ubuntu_14_04();
 
-        dist.name.should.equal('ubuntu');
-        dist.version.should.equal('14.04');
+        expect(dist.name).toBe('ubuntu');
+        expect(dist.version).toBe('14.04');
     });
 
     test('Retrieve correct information for Fedora 23', () => {
         const dist = distro_fedora_23();
 
-        dist.name.should.equal('fedora');
-        dist.version.should.equal('23');
+        expect(dist.name).toBe('fedora');
+        expect(dist.version).toBe('23');
     });
 
     test('Retrieve correct information for Debian 8', () => {
         const dist = distro_debian_8();
 
-        dist.name.should.equal('debian');
-        dist.version.should.equal('8');
+        expect(dist.name).toBe('debian');
+        expect(dist.version).toBe('8');
     });
 
     test('Retrieve correct information for CentOS 7', () => {
         const dist = distro_centos_7();
 
-        dist.name.should.equal('centos');
-        dist.version.should.equal('7');
+        expect(dist.name).toBe('centos');
+        expect(dist.version).toBe('7');
     });
 });
 
diff --git a/package-lock.json b/package-lock.json
index da909635e..2ba2f52de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "csharp",
-  "version": "v2.0.436",
+  "version": "2.7.25",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "csharp",
-      "version": "v2.0.436",
+      "version": "2.7.25",
       "license": "SEE LICENSE IN RuntimeLicenses/license.txt",
       "dependencies": {
         "@microsoft/servicehub-framework": "4.2.99-beta",
@@ -14,8 +14,10 @@
         "@types/cross-spawn": "6.0.2",
         "@vscode/debugprotocol": "1.56.0",
         "@vscode/extension-telemetry": "0.6.2",
+        "@vscode/js-debug-browsers": "^1.1.0",
         "async-file": "2.0.2",
         "cross-spawn": "6.0.5",
+        "execa": "4.0.0",
         "fs-extra": "9.1.0",
         "http-proxy-agent": "4.0.1",
         "https-proxy-agent": "5.0.0",
@@ -26,7 +28,7 @@
         "ps-list": "7.2.0",
         "request-light": "0.4.0",
         "rxjs": "6.6.7",
-        "semver": "5.7.2",
+        "semver": "7.5.4",
         "stream": "0.0.2",
         "strip-bom": "5.0.0",
         "strip-bom-buf": "2.0.0",
@@ -34,7 +36,6 @@
         "tmp": "0.0.33",
         "uuid": "^9.0.0",
         "vscode-html-languageservice": "^5.0.1",
-        "vscode-js-debug-browsers": "^1.0.5",
         "vscode-jsonrpc": "8.2.0-next.0",
         "vscode-languageclient": "8.2.0-next.1",
         "vscode-languageserver-protocol": "3.17.4-next.1",
@@ -55,7 +56,7 @@
         "@types/minimist": "1.2.1",
         "@types/mocha": "5.2.5",
         "@types/node": "16.11.38",
-        "@types/semver": "5.5.0",
+        "@types/semver": "7.3.13",
         "@types/tar": "6.1.5",
         "@types/tmp": "0.0.33",
         "@types/unzipper": "^0.9.1",
@@ -65,6 +66,7 @@
         "@typescript-eslint/eslint-plugin": "^5.61.0",
         "@typescript-eslint/parser": "^5.61.0",
         "@vscode/test-electron": "2.3.4",
+        "@vscode/vsce": "2.21.0",
         "archiver": "5.3.0",
         "chai": "4.3.4",
         "chai-arrays": "2.2.0",
@@ -101,7 +103,8 @@
         "ts-node": "9.1.1",
         "typescript": "^5.1.6",
         "unzipper": "0.10.11",
-        "vsce": "2.9.2",
+        "vscode-oniguruma": "^1.6.1",
+        "vscode-textmate": "^6.0.0",
         "vscode-uri": "^3.0.7",
         "webpack": "5.76.0",
         "webpack-cli": "4.6.0"
@@ -124,12 +127,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.22.10",
+        "@babel/highlight": "^7.22.13",
         "chalk": "^2.4.2"
       },
       "engines": {
@@ -208,12 +211,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -275,22 +278,22 @@
       "dev": true
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -382,9 +385,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -414,12 +417,12 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
@@ -428,9 +431,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -617,33 +620,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.10",
-        "@babel/types": "^7.22.10",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -684,13 +687,13 @@
       "dev": true
     },
     "node_modules/@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1399,21 +1402,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/@jest/reporters/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@jest/reporters/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2543,9 +2531,9 @@
       "dev": true
     },
     "node_modules/@types/semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
       "dev": true
     },
     "node_modules/@types/stack-utils": {
@@ -2709,21 +2697,6 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/parser": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
@@ -2933,21 +2906,6 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
@@ -2980,21 +2938,6 @@
       "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
       "dev": true
     },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
@@ -3036,6 +2979,98 @@
         "vscode": "^1.60.0"
       }
     },
+    "node_modules/@vscode/js-debug-browsers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vscode/js-debug-browsers/-/js-debug-browsers-1.1.0.tgz",
+      "integrity": "sha512-v2hkBzA3DlUYxq3fMpCR8xuzmYjkoYjy276XA7mzZVstsFYkfbsOkluRwulrbqEEsjy3XObPNZq+A3ZZkpC+Gw==",
+      "dependencies": {
+        "execa": "^4.0.0"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@vscode/js-debug-browsers/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/@vscode/test-electron": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.4.tgz",
@@ -3051,21 +3086,110 @@
         "node": ">=16"
       }
     },
-    "node_modules/@vscode/test-electron/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+    "node_modules/@vscode/vsce": {
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.21.0.tgz",
+      "integrity": "sha512-KuxYqScqUY/duJbkj9eE2tN2X/WJoGAy54hHtxT3ZBkM6IzrOg7H7CXGUPBxNlmqku2w/cAjOUSrgIHlzz0mbA==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
+        "azure-devops-node-api": "^11.0.1",
+        "chalk": "^2.4.2",
+        "cheerio": "^1.0.0-rc.9",
+        "commander": "^6.2.1",
+        "glob": "^7.0.6",
+        "hosted-git-info": "^4.0.2",
+        "jsonc-parser": "^3.2.0",
+        "leven": "^3.1.0",
+        "markdown-it": "^12.3.2",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.3",
+        "parse-semver": "^1.1.1",
+        "read": "^1.0.7",
+        "semver": "^7.5.2",
+        "tmp": "^0.2.1",
+        "typed-rest-client": "^1.8.4",
+        "url-join": "^4.0.1",
+        "xml2js": "^0.5.0",
+        "yauzl": "^2.3.1",
+        "yazl": "^2.2.2"
       },
       "bin": {
-        "semver": "bin/semver.js"
+        "vsce": "vsce"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.7.0"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/@vscode/vsce/node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
+    },
+    "node_modules/@vscode/vsce/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dev": true,
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "dev": true,
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -4528,21 +4652,6 @@
         "semver": "^7.0.0"
       }
     },
-    "node_modules/builtins/node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -4822,7 +4931,8 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.2",
@@ -5295,6 +5405,14 @@
         "node": ">=4.8"
       }
     },
+    "node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/css-select": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -5364,6 +5482,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -5405,6 +5524,7 @@
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=4.0.0"
       }
@@ -5576,6 +5696,7 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -6362,21 +6483,6 @@
         "node": "*"
       }
     },
-    "node_modules/eslint-plugin-n/node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/eslint-plugin-prettier": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
@@ -6563,21 +6669,6 @@
         "regexp-tree": "~0.1.1"
       }
     },
-    "node_modules/eslint-plugin-unicorn/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/eslint-plugin-unicorn/node_modules/type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -6966,9 +7057,9 @@
       }
     },
     "node_modules/execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
+      "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -7123,6 +7214,7 @@
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -7844,7 +7936,8 @@
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/glob": {
       "version": "7.2.0",
@@ -11043,21 +11136,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jest-snapshot/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11482,21 +11560,6 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
-    "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jszip": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
@@ -11542,6 +11605,7 @@
       "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==",
       "dev": true,
       "hasInstallScript": true,
+      "optional": true,
       "dependencies": {
         "node-addon-api": "^4.3.0",
         "prebuild-install": "^7.0.1"
@@ -11933,21 +11997,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -12233,20 +12282,6 @@
         "vscode": "1.69.0"
       }
     },
-    "node_modules/microsoft.aspnetcore.razor.vscode/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/microsoft.aspnetcore.razor.vscode/node_modules/vscode-jsonrpc": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz",
@@ -12323,6 +12358,7 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -12429,7 +12465,8 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/mocha": {
       "version": "10.0.0",
@@ -12821,7 +12858,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
@@ -12894,6 +12932,7 @@
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz",
       "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -12901,26 +12940,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-abi/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/node-addon-api": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
       "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
@@ -12951,6 +12976,15 @@
         "validate-npm-package-license": "^3.0.1"
       }
     },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -13397,6 +13431,15 @@
         "semver": "^5.1.0"
       }
     },
+    "node_modules/parse-semver/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
@@ -13686,6 +13729,7 @@
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -14000,6 +14044,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -14015,6 +14060,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14550,11 +14596,17 @@
       }
     },
     "node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/semver-greatest-satisfied-range": {
@@ -14709,7 +14761,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "optional": true
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
@@ -14730,6 +14783,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "optional": true,
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -15302,6 +15356,7 @@
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -15627,21 +15682,6 @@
         }
       }
     },
-    "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ts-jest/node_modules/yargs-parser": {
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
@@ -15742,21 +15782,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ts-loader/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -15871,6 +15896,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -16393,88 +16419,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/vsce": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.9.2.tgz",
-      "integrity": "sha512-xyLqL4U82BilUX1t6Ym2opQEa2tLGWYjbgB7+ETeNVXlIJz5sWBJjQJSYJVFOKJSpiOtQclolu88cj7oY6vvPQ==",
-      "dev": true,
-      "dependencies": {
-        "azure-devops-node-api": "^11.0.1",
-        "chalk": "^2.4.2",
-        "cheerio": "^1.0.0-rc.9",
-        "commander": "^6.1.0",
-        "glob": "^7.0.6",
-        "hosted-git-info": "^4.0.2",
-        "keytar": "^7.7.0",
-        "leven": "^3.1.0",
-        "markdown-it": "^12.3.2",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.3",
-        "parse-semver": "^1.1.1",
-        "read": "^1.0.7",
-        "semver": "^5.1.0",
-        "tmp": "^0.2.1",
-        "typed-rest-client": "^1.8.4",
-        "url-join": "^4.0.1",
-        "xml2js": "^0.4.23",
-        "yauzl": "^2.3.1",
-        "yazl": "^2.2.2"
-      },
-      "bin": {
-        "vsce": "vsce"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/vsce/node_modules/commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/vsce/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vsce/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/vsce/node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
     "node_modules/vscode-html-languageservice": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.4.tgz",
@@ -16491,15 +16435,6 @@
       "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz",
       "integrity": "sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="
     },
-    "node_modules/vscode-js-debug-browsers": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/vscode-js-debug-browsers/-/vscode-js-debug-browsers-1.0.5.tgz",
-      "integrity": "sha512-p4/ItCYUbTAuMAyVIt23m6/W5ZHK/ruWsNJpbtTz0sYsrYQmGF7L5/hDPMTGBNIaQb9SDobn3asuoR479x8Z6Q==",
-      "deprecated": "This package has been renamed to @vscode/js-debug-browsers, please update to the new name",
-      "dependencies": {
-        "execa": "^4.0.0"
-      }
-    },
     "node_modules/vscode-jsonrpc": {
       "version": "8.2.0-next.0",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz",
@@ -16540,20 +16475,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/vscode-languageclient/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/vscode-languageserver-protocol": {
       "version": "3.17.4-next.1",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz",
@@ -16583,6 +16504,18 @@
       "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.1.tgz",
       "integrity": "sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A=="
     },
+    "node_modules/vscode-oniguruma": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+      "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
+      "dev": true
+    },
+    "node_modules/vscode-textmate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-6.0.0.tgz",
+      "integrity": "sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==",
+      "dev": true
+    },
     "node_modules/vscode-uri": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
@@ -17018,19 +16951,6 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "dev": true,
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/xmlbuilder": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
@@ -17266,12 +17186,12 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.22.10",
+        "@babel/highlight": "^7.22.13",
         "chalk": "^2.4.2"
       }
     },
@@ -17328,12 +17248,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -17384,19 +17304,19 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true
     },
     "@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -17461,9 +17381,9 @@
       "dev": true
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true
     },
     "@babel/helper-validator-option": {
@@ -17484,20 +17404,20 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
@@ -17627,30 +17547,30 @@
       }
     },
     "@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.10",
-        "@babel/types": "^7.22.10",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -17679,13 +17599,13 @@
       }
     },
     "@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -18211,15 +18131,6 @@
             }
           }
         },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -19173,9 +19084,9 @@
       "dev": true
     },
     "@types/semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
       "dev": true
     },
     "@types/stack-utils": {
@@ -19314,15 +19225,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "semver": {
-          "version": "7.5.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -19449,15 +19351,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -19482,15 +19375,6 @@
           "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
           "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
           "dev": true
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -19524,6 +19408,73 @@
         "@microsoft/1ds-post-js": "^3.2.3"
       }
     },
+    "@vscode/js-debug-browsers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vscode/js-debug-browsers/-/js-debug-browsers-1.1.0.tgz",
+      "integrity": "sha512-v2hkBzA3DlUYxq3fMpCR8xuzmYjkoYjy276XA7mzZVstsFYkfbsOkluRwulrbqEEsjy3XObPNZq+A3ZZkpC+Gw==",
+      "requires": {
+        "execa": "^4.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "human-signals": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+          "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "@vscode/test-electron": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.4.tgz",
@@ -19534,16 +19485,85 @@
         "https-proxy-agent": "^5.0.0",
         "jszip": "^3.10.1",
         "semver": "^7.5.2"
+      }
+    },
+    "@vscode/vsce": {
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.21.0.tgz",
+      "integrity": "sha512-KuxYqScqUY/duJbkj9eE2tN2X/WJoGAy54hHtxT3ZBkM6IzrOg7H7CXGUPBxNlmqku2w/cAjOUSrgIHlzz0mbA==",
+      "dev": true,
+      "requires": {
+        "azure-devops-node-api": "^11.0.1",
+        "chalk": "^2.4.2",
+        "cheerio": "^1.0.0-rc.9",
+        "commander": "^6.2.1",
+        "glob": "^7.0.6",
+        "hosted-git-info": "^4.0.2",
+        "jsonc-parser": "^3.2.0",
+        "keytar": "^7.7.0",
+        "leven": "^3.1.0",
+        "markdown-it": "^12.3.2",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.3",
+        "parse-semver": "^1.1.1",
+        "read": "^1.0.7",
+        "semver": "^7.5.2",
+        "tmp": "^0.2.1",
+        "typed-rest-client": "^1.8.4",
+        "url-join": "^4.0.1",
+        "xml2js": "^0.5.0",
+        "yauzl": "^2.3.1",
+        "yazl": "^2.2.2"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+        "commander": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+          "dev": true
+        },
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "jsonc-parser": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+          "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "tmp": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+          "dev": true,
+          "requires": {
+            "rimraf": "^3.0.0"
+          }
+        },
+        "xml2js": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+          "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+          "dev": true,
+          "requires": {
+            "sax": ">=0.6.0",
+            "xmlbuilder": "~11.0.0"
+          }
         }
       }
     },
@@ -20700,17 +20720,6 @@
       "dev": true,
       "requires": {
         "semver": "^7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
       }
     },
     "bytes": {
@@ -20929,7 +20938,8 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "chrome-trace-event": {
       "version": "1.0.2",
@@ -21315,6 +21325,13 @@
         "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+        }
       }
     },
     "css-select": {
@@ -21371,6 +21388,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "mimic-response": "^3.1.0"
       }
@@ -21395,7 +21413,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "deep-is": {
       "version": "0.1.4",
@@ -21524,7 +21543,8 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "detect-newline": {
       "version": "3.1.0",
@@ -22301,15 +22321,6 @@
           "requires": {
             "brace-expansion": "^1.1.7"
           }
-        },
-        "semver": {
-          "version": "7.5.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -22442,15 +22453,6 @@
             "regexp-tree": "~0.1.1"
           }
         },
-        "semver": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-          "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "type-fest": {
           "version": "0.8.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -22559,9 +22561,9 @@
       "dev": true
     },
     "execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
+      "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==",
       "requires": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -22677,7 +22679,8 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "expand-tilde": {
       "version": "2.0.2",
@@ -23253,7 +23256,8 @@
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "glob": {
       "version": "7.2.0",
@@ -25623,15 +25627,6 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -25951,15 +25946,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -26007,6 +25993,7 @@
       "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz",
       "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "node-addon-api": "^4.3.0",
         "prebuild-install": "^7.0.1"
@@ -26318,17 +26305,6 @@
       "dev": true,
       "requires": {
         "semver": "^7.5.3"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
       }
     },
     "make-error": {
@@ -26570,14 +26546,6 @@
         "vscode-languageserver-textdocument": "^1.0.5"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "vscode-jsonrpc": {
           "version": "8.0.2",
           "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz",
@@ -26634,7 +26602,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "min-indent": {
       "version": "1.0.1",
@@ -26715,7 +26684,8 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "mocha": {
       "version": "10.0.0",
@@ -27022,7 +26992,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "natural-compare": {
       "version": "1.4.0",
@@ -27093,26 +27064,17 @@
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz",
       "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
       }
     },
     "node-addon-api": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
       "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node-int64": {
       "version": "0.4.0",
@@ -27141,6 +27103,14 @@
         "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+          "dev": true
+        }
       }
     },
     "normalize-path": {
@@ -27474,6 +27444,14 @@
       "dev": true,
       "requires": {
         "semver": "^5.1.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+          "dev": true
+        }
       }
     },
     "parse5": {
@@ -27702,6 +27680,7 @@
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -27926,6 +27905,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -27937,7 +27917,8 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
           "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -28348,9 +28329,12 @@
       }
     },
     "semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
     "semver-greatest-satisfied-range": {
       "version": "1.1.0",
@@ -28465,13 +28449,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
       "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "simple-get": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
       "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -28953,6 +28939,7 @@
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
+      "optional": true,
       "requires": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -29162,15 +29149,6 @@
         "yargs-parser": "^21.0.1"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "yargs-parser": {
           "version": "21.1.1",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
@@ -29242,15 +29220,6 @@
             "picomatch": "^2.2.3"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -29338,6 +29307,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -29748,69 +29718,6 @@
         }
       }
     },
-    "vsce": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.9.2.tgz",
-      "integrity": "sha512-xyLqL4U82BilUX1t6Ym2opQEa2tLGWYjbgB7+ETeNVXlIJz5sWBJjQJSYJVFOKJSpiOtQclolu88cj7oY6vvPQ==",
-      "dev": true,
-      "requires": {
-        "azure-devops-node-api": "^11.0.1",
-        "chalk": "^2.4.2",
-        "cheerio": "^1.0.0-rc.9",
-        "commander": "^6.1.0",
-        "glob": "^7.0.6",
-        "hosted-git-info": "^4.0.2",
-        "keytar": "^7.7.0",
-        "leven": "^3.1.0",
-        "markdown-it": "^12.3.2",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.3",
-        "parse-semver": "^1.1.1",
-        "read": "^1.0.7",
-        "semver": "^5.1.0",
-        "tmp": "^0.2.1",
-        "typed-rest-client": "^1.8.4",
-        "url-join": "^4.0.1",
-        "xml2js": "^0.4.23",
-        "yauzl": "^2.3.1",
-        "yazl": "^2.2.2"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-          "dev": true
-        },
-        "hosted-git-info": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "tmp": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-          "dev": true,
-          "requires": {
-            "rimraf": "^3.0.0"
-          }
-        }
-      }
-    },
     "vscode-html-languageservice": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.4.tgz",
@@ -29829,14 +29736,6 @@
         }
       }
     },
-    "vscode-js-debug-browsers": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/vscode-js-debug-browsers/-/vscode-js-debug-browsers-1.0.5.tgz",
-      "integrity": "sha512-p4/ItCYUbTAuMAyVIt23m6/W5ZHK/ruWsNJpbtTz0sYsrYQmGF7L5/hDPMTGBNIaQb9SDobn3asuoR479x8Z6Q==",
-      "requires": {
-        "execa": "^4.0.0"
-      }
-    },
     "vscode-jsonrpc": {
       "version": "8.2.0-next.0",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz",
@@ -29867,14 +29766,6 @@
           "requires": {
             "brace-expansion": "^2.0.1"
           }
-        },
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -29909,6 +29800,18 @@
       "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.1.tgz",
       "integrity": "sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A=="
     },
+    "vscode-oniguruma": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+      "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
+      "dev": true
+    },
+    "vscode-textmate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-6.0.0.tgz",
+      "integrity": "sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==",
+      "dev": true
+    },
     "vscode-uri": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
@@ -30233,16 +30136,6 @@
         "signal-exit": "^3.0.7"
       }
     },
-    "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "dev": true,
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      }
-    },
     "xmlbuilder": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
diff --git a/package.json b/package.json
index 938cad47d..49c896a57 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "muhammad-sammy",
-  "version": "2.0.436",
+  "version": "2.7.25",
   "description": "C# support for vscode-compatible editors (powered by OmniSharp and NetCoreDbg).",
   "displayName": "C#",
   "author": "Muhammad Sammy",
@@ -37,9 +37,9 @@
     }
   },
   "defaults": {
-    "roslyn": "4.8.0-2.23428.2",
-    "omniSharp": "1.39.7",
-    "razor": "7.0.0-preview.23423.3",
+    "roslyn": "4.9.0-1.23513.7",
+    "omniSharp": "1.39.10",
+    "razor": "7.0.0-preview.23513.5",
     "razorOmnisharp": "7.0.0-preview.23363.1"
   },
   "main": "./dist/extension",
@@ -55,11 +55,15 @@
   "scripts": {
     "vscode:prepublish": "tsc -p ./ && webpack --mode production",
     "l10nDevGenerateLocalizationBundle": "npx @vscode/l10n-dev export --outDir ./l10n ./src",
-    "compile": "tsc -p ./ && npx eslint ./ && npm run l10nDevGenerateLocalizationBundle",
+    "compile": "tsc -p ./ && npx eslint ./ && npm run l10nDevGenerateLocalizationBundle && npm run compile:razorTextMate",
+    "compile:razorTextMate": "npx js-yaml src/razor/syntaxes/aspnetcorerazor.tmLanguage.yml > src/razor/syntaxes/aspnetcorerazor.tmLanguage.json",
     "compileDev": "tsc -p ./ && npx eslint ./ && webpack --mode development && npm run l10nDevGenerateLocalizationBundle",
     "watch": "tsc -watch -p ./",
     "tdd": "mocha --config ./.mocharc.jsonc --watch --watch-extensions ts omnisharptest/omnisharpUnitTests/**/*.test.ts*",
     "test": "tsc -p ./ && gulp test",
+    "test:integration": "tsc -p ./ && gulp test:integration",
+    "test:razor": "tsc -p ./ && npm run compile:razorTextMate && gulp test:razor",
+    "test:razorintegration": "tsc -p ./ && gulp test:razorintegration",
     "omnisharptest": "tsc -p ./ && gulp omnisharptest",
     "omnisharptest:unit": "tsc -p ./ && gulp omnisharptest:unit",
     "omnisharptest:feature": "tsc -p ./ && gulp omnisharptest:feature",
@@ -68,7 +72,6 @@
     "omnisharptest:integration:slnWithCsproj": "tsc -p ./ && gulp omnisharptest:integration:slnWithCsproj",
     "omnisharptest:integration:slnFilterWithCsproj": "tsc -p ./ && gulp omnisharptest:integration:slnFilterWithCsproj",
     "omnisharptest:artifacts": "tsc -p ./ && mocha out/omnisharptest/omnisharpArtifactTests/**/*.test.js",
-    "test:integration:slnWithCsproj": "tsc -p ./ && gulp test:integration:slnWithCsproj",
     "unpackage:vsix": "gulp vsix:release:unpackage",
     "updatePackageDependencies": "gulp updatePackageDependencies",
     "l10nDevGenerateXlf": "npx @vscode/l10n-dev generate-xlf ./package.nls.json ./l10n/bundle.l10n.json --outFile ./loc/vscode-csharp.xlf",
@@ -83,8 +86,10 @@
     "@types/cross-spawn": "6.0.2",
     "@vscode/debugprotocol": "1.56.0",
     "@vscode/extension-telemetry": "0.6.2",
+    "@vscode/js-debug-browsers": "^1.1.0",
     "async-file": "2.0.2",
     "cross-spawn": "6.0.5",
+    "execa": "4.0.0",
     "fs-extra": "9.1.0",
     "http-proxy-agent": "4.0.1",
     "https-proxy-agent": "5.0.0",
@@ -95,7 +100,7 @@
     "ps-list": "7.2.0",
     "request-light": "0.4.0",
     "rxjs": "6.6.7",
-    "semver": "5.7.2",
+    "semver": "7.5.4",
     "stream": "0.0.2",
     "strip-bom": "5.0.0",
     "strip-bom-buf": "2.0.0",
@@ -103,7 +108,6 @@
     "tmp": "0.0.33",
     "uuid": "^9.0.0",
     "vscode-html-languageservice": "^5.0.1",
-    "vscode-js-debug-browsers": "^1.0.5",
     "vscode-jsonrpc": "8.2.0-next.0",
     "vscode-languageclient": "8.2.0-next.1",
     "vscode-languageserver-protocol": "3.17.4-next.1",
@@ -124,7 +128,7 @@
     "@types/minimist": "1.2.1",
     "@types/mocha": "5.2.5",
     "@types/node": "16.11.38",
-    "@types/semver": "5.5.0",
+    "@types/semver": "7.3.13",
     "@types/tar": "6.1.5",
     "@types/tmp": "0.0.33",
     "@types/unzipper": "^0.9.1",
@@ -170,7 +174,9 @@
     "ts-node": "9.1.1",
     "typescript": "^5.1.6",
     "unzipper": "0.10.11",
-    "vsce": "2.9.2",
+    "@vscode/vsce": "2.21.0",
+    "vscode-oniguruma": "^1.6.1",
+    "vscode-textmate": "^6.0.0",
     "vscode-uri": "^3.0.7",
     "webpack": "5.76.0",
     "webpack-cli": "4.6.0"
@@ -179,104 +185,104 @@
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Windows (.NET 4.7.2 / x86)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x86-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "x86"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/OmniSharp.exe",
+      "installTestPath": "./.omnisharp/1.39.10/OmniSharp.exe",
       "platformId": "win-x86",
       "isFramework": true,
-      "integrity": "04535972281731CA7F7E857D6ABBB9D726DC7E9FA4D8A96573169AA97D3C30FA"
+      "integrity": "C81CE2099AD494EF63F9D88FAA70D55A68CF175810F944526FF94AAC7A5109F9"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Windows (.NET 6 / x86)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x86-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "x86"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "win-x86",
       "isFramework": false,
-      "integrity": "7F52CCF77D53513CF3073496123E84ED0D4983908404299D0E697947CEAC495D"
+      "integrity": "B7E62415CFC3DAC2154AC636C5BF0FB4B2C9BBF11B5A1FBF72381DDDED59791E"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Windows (.NET 4.7.2 / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x64-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "x86_64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/OmniSharp.exe",
+      "installTestPath": "./.omnisharp/1.39.10/OmniSharp.exe",
       "platformId": "win-x64",
       "isFramework": true,
-      "integrity": "2A389B3055EA5D928A950A60853857582FDA2C3B7E1659158578E0C9CD951FEC"
+      "integrity": "BE0ED10AACEA17E14B78BD0D887DE5935D4ECA3712192A701F3F2100CA3C8B6E"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Windows (.NET 6 / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "x86_64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "win-x64",
       "isFramework": false,
-      "integrity": "ADC15D4997A64B274783A9F1F7FC3EA1CDEC7E353A060D0D0FA2691FD051D682"
+      "integrity": "A73327395E7EF92C1D8E307055463DA412662C03F077ECC743462FD2760BB537"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Windows (.NET 4.7.2 / arm64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-arm64-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "arm64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/OmniSharp.exe",
+      "installTestPath": "./.omnisharp/1.39.10/OmniSharp.exe",
       "platformId": "win-arm64",
       "isFramework": true,
-      "integrity": "4C1BA44B1E9FE56F01813DBA588A1B715804D061A4758C0E5910FCE175CBB8CF"
+      "integrity": "32FA0067B0639F87760CD1A769B16E6A53588C137C4D31661836CA4FB28D3DD6"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Windows (.NET 6 / arm64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-arm64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "arm64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "win-arm64",
       "isFramework": false,
-      "integrity": "4569F777A71C8E63BA09630EFD0DFEB397BE5E4F1528142E09F3005F7BA007FA"
+      "integrity": "433F9B360CAA7B4DDD85C604D5C5542C1A718BCF2E71B2BCFC7526E6D41F4E8F"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for OSX (Mono / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "darwin"
       ],
@@ -288,48 +294,48 @@
         "./mono.osx",
         "./run"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/run",
+      "installTestPath": "./.omnisharp/1.39.10/run",
       "platformId": "osx",
       "isFramework": true,
-      "integrity": "9137C09D69252ACD5E9B518A725D12660002FC1CDC958A4654AAE3F922540651"
+      "integrity": "2CC42F0EC7C30CFA8858501D12ECB6FB685A1FCFB8ECB35698A4B12406551968"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for OSX (.NET 6 / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-x64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-x64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "darwin"
       ],
       "architectures": [
         "x86_64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "osx-x64",
       "isFramework": false,
-      "integrity": "26F4FA6CD2A6153FD16829FDFCFAE1BB34289E7B96AC833B8BE0A559EFE5656B"
+      "integrity": "C9D6E9F2C839A66A7283AE6A9EC545EE049B48EB230D33E91A6322CB67FF9D97"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for OSX (.NET 6 / arm64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-arm64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-arm64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "darwin"
       ],
       "architectures": [
         "arm64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "osx-arm64",
       "isFramework": false,
-      "integrity": "8239FA8712EC0D5CEFFFA3B3DBFA1E788864938FAECDBFA8C9D59F55647BC4B2"
+      "integrity": "851350F52F83E3BAD5A92D113E4B9882FCD1DEB16AA84FF94B6F2CEE3C70051E"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux (Mono / x86)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x86-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x86-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "linux"
       ],
@@ -341,16 +347,16 @@
         "./mono.linux-x86",
         "./run"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/run",
+      "installTestPath": "./.omnisharp/1.39.10/run",
       "platformId": "linux-x86",
       "isFramework": true,
-      "integrity": "1ABB15DCBA71D16D78D718D4A225A2BD2E7F54805389B7810A72F4091554C906"
+      "integrity": "474B1CDBAE64CFEC655FB6B0659BCE481023C48274441C72991E67B6E13E56A1"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux (Mono / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x64-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "linux"
       ],
@@ -361,32 +367,32 @@
         "./mono.linux-x86_64",
         "./run"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/run",
+      "installTestPath": "./.omnisharp/1.39.10/run",
       "platformId": "linux-x64",
       "isFramework": true,
-      "integrity": "AE83C428FACAB366E18AE02043588F989C79C8FBF49D3FC56A0BC368DFF1CC94"
+      "integrity": "FB4CAA47343265100349375D79DBCCE1868950CED675CB07FCBE8462EDBCDD37"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux (.NET 6 / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "linux"
       ],
       "architectures": [
         "x86_64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "linux-x64",
       "isFramework": false,
-      "integrity": "A5830FA3F9D20546AD791071EBDE3B7A2A8D11FDCD30728DABEE6BB3041C9F7F"
+      "integrity": "0926D3BEA060BF4373356B2FC0A68C10D0DE1B1150100B551BA5932814CE51E2"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux (Mono / arm64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-arm64-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10",
       "platforms": [
         "linux"
       ],
@@ -397,58 +403,58 @@
         "./mono.linux-arm64",
         "./run"
       ],
-      "installTestPath": "./.omnisharp/1.39.7/run",
+      "installTestPath": "./.omnisharp/1.39.10/run",
       "platformId": "linux-arm64",
       "isFramework": true,
-      "integrity": "479F1E3E1A70B6E3FEAC6324715042025FB93BE8F8355CE0B750A52C1F9960F5"
+      "integrity": "478F3594DFD0167E9A56E36F0364A86C73F8132A3E7EA916CA1419EFE141D2CC"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux (.NET 6 / arm64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-arm64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "linux"
       ],
       "architectures": [
         "arm64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "linux-arm64",
       "isFramework": false,
-      "integrity": "9EFE06FD38A5B78D968B627BFE1276B8193B7EDF659624EACF43F89D8560ADE0"
+      "integrity": "6FB6A572043A74220A92F6C19C7BB0C3743321C7563A815FD2702EF4FA7D688E"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux musl (.NET 6 / x64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-musl-x64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-x64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "linux-musl"
       ],
       "architectures": [
         "x86_64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "linux-musl-x64",
       "isFramework": false,
-      "integrity": "613EE930F72AF3C26514670AAD06B26C88A4D9233C60408ABD323406F4265807"
+      "integrity": "6BFDA3AD11DBB0C6514B86ECC3E1597CC41C6E309B7575F7C599E07D9E2AE610"
     },
     {
       "id": "OmniSharp",
       "description": "OmniSharp for Linux musl (.NET 6 / arm64)",
-      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-musl-arm64-net6.0-1.39.7.zip",
-      "installPath": ".omnisharp/1.39.7-net6.0",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-arm64-net6.0-1.39.10.zip",
+      "installPath": ".omnisharp/1.39.10-net6.0",
       "platforms": [
         "linux-musl"
       ],
       "architectures": [
         "arm64"
       ],
-      "installTestPath": "./.omnisharp/1.39.7-net6.0/OmniSharp.dll",
+      "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll",
       "platformId": "linux-musl-arm64",
       "isFramework": false,
-      "integrity": "9A5A66AA312B99A55BC57E5FC05985C7AD0916B60B9E22B2E4F456AC68929CE4"
+      "integrity": "DA63619EA024EB9BBF6DB5A85C6150CAB5C0BD554544A3596ED1B17F926D6875"
     },
     {
       "id": "Debugger",
@@ -516,7 +522,7 @@
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/a48c3e83b44a34ddb295099c55e31e7e/razorlanguageserver-win-x64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/e0d9dc729905a672edb6bb44239fceb0/razorlanguageserver-win-x64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -524,12 +530,12 @@
       "architectures": [
         "x86_64"
       ],
-      "integrity": "A7815AE5A9BEFE7EB5C0006343341A38D0F7A662865DAD21F0842E064322C186"
+      "integrity": "50CFBE5021DE39A1E207E32321BFDF4FCAEBE0D34EF8C8A64143AC7AADF6EB12"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / x86)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/e188fa3cbd9a5601701d0f8de0705496/razorlanguageserver-win-x86-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/c7f08527fbb3809f6dc8e4bf2dc81571/razorlanguageserver-win-x86-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -537,12 +543,12 @@
       "architectures": [
         "x86"
       ],
-      "integrity": "D543C2E513F93F91AEDD95AE2A410747D71D3E7CF4D32E0FA31F8B7691109F6F"
+      "integrity": "DF2A885EC2FEE6DC6140A0465549476B164C6552040D6F946AD5B6C6FB85D2BE"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/695b332017bfa81af74787904979fde8/razorlanguageserver-win-arm64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/efe8ebdcd7f4162a537acb9325234f02/razorlanguageserver-win-arm64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -550,12 +556,12 @@
       "architectures": [
         "arm64"
       ],
-      "integrity": "DF2E2F442BE365DE390F7402CE69E5514D91D379A4A755133B696CC2972CFE53"
+      "integrity": "3A7E49E531C6870B37341A8B57D0C26AB7BCD779CD173C02CBCDB16D0A273D82"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/b9653cb6c40f965986266f70ae7dab25/razorlanguageserver-linux-x64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/5ece63dde175c03ce79a8ec91005537b/razorlanguageserver-linux-x64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "linux"
@@ -566,12 +572,12 @@
       "binaries": [
         "./rzls"
       ],
-      "integrity": "87D1357F1BCDCBA9D775677B5ADFFE22D87B013155B3ADBDA69F9CEA0F5C0FCF"
+      "integrity": "BB9856808252ADE6AAC1CD55939373E7237D846EC9101FE306113B5EE93376B7"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/4aca138f5c6299422e240dcc50689a67/razorlanguageserver-linux-arm64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/bb7cd0c44e45bd21cd1341a4a6e87f1c/razorlanguageserver-linux-arm64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "linux"
@@ -582,12 +588,12 @@
       "binaries": [
         "./rzls"
       ],
-      "integrity": "9E8C75DBEA512D7FCE5D96D240D57E6C12161EDFE7482A8F68F99BD5019F3EC1"
+      "integrity": "B7197A7C3F544BE91713C2776F86C32AF58B7D1B1FD43042ACC8AAA0541EAC75"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux musl / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/7d1e4e0bf72de43dc272d22de2486633/razorlanguageserver-linux-musl-x64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/fb08013aad8cfbb2bc2c3f5f4d276a0d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "linux-musl"
@@ -598,12 +604,12 @@
       "binaries": [
         "./rzls"
       ],
-      "integrity": "AD36EAA27AC75EF161E4642454B995FFE71751ED7B89C6B4233D1D577CB763A6"
+      "integrity": "28BD44F3ED9C6FDC8A2E8B73BD12587D5110898ABFB49D8D880748B33F6B050C"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux musl ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/eee386c129c18ba1705fe411cb981a20/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/159a171a7cc1ceb96604d148d5c75574/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "linux-musl"
@@ -614,12 +620,12 @@
       "binaries": [
         "./rzls"
       ],
-      "integrity": "EC8279752254F33AECC5D59E7D02DC93BB37EF2740CC63ACFF0DB78725BF169C"
+      "integrity": "F2BA9D7CA2B2424D6A5B00D8E23BC3BD646144FF1A623471A50F358277B7919B"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (macOS / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/74f8a06bc496f54b37466c382c6744ee/razorlanguageserver-osx-x64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/8a13539f57d6e59b32e767d3684c6c84/razorlanguageserver-osx-x64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "darwin"
@@ -630,12 +636,12 @@
       "binaries": [
         "./rzls"
       ],
-      "integrity": "FE3356F653A786A5442E99AA6FE19DD9215962F9B926AD2E723596A5B6E3C135"
+      "integrity": "9513C71E033B47DECC6077D93844E165FFA66800309169B6CEABC2CCEC7EAFFB"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (macOS ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/679c6fe63c016298914264c33326f2ea/razorlanguageserver-osx-arm64-7.0.0-preview.23423.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/89a58de8daaea554d00105dc435dfc98/razorlanguageserver-osx-arm64-7.0.0-preview.23513.5.zip",
       "installPath": ".razor",
       "platforms": [
         "darwin"
@@ -646,7 +652,7 @@
       "binaries": [
         "./rzls"
       ],
-      "integrity": "594EAE393087FD002829041B261D6777CBA17E612783C548E1B9B2D20BE97E54"
+      "integrity": "A102654F519C7D3B8D60C8E5FF390ED08498E0A9BF23089DBDD581A148130A03"
     },
     {
       "id": "RazorOmnisharp",
@@ -814,32 +820,674 @@
         "path": "./themes/vs2019_light.json"
       }
     ],
-    "configuration": {
-      "title": "C# configuration",
-      "properties": {
-        "csharp.format.enable": {
-          "type": "boolean",
-          "default": true,
-          "description": "Enable/disable default C# formatter (requires restart)."
-        },
-        "csharp.suppressDotnetInstallWarning": {
-          "type": "boolean",
-          "default": false,
-          "description": "Suppress the warning that the .NET Core SDK is not on the path."
-        },
-        "csharp.unitTestDebuggingOptions": {
-          "type": "object",
-          "description": "Options to use with the debugger when launching for unit test debugging.",
-          "default": {},
-          "properties": {
-            "sourceFileMap": {
-              "type": "object",
-              "description": "Optional source file mappings passed to the debug engine. Example: '{ \"C:\\foo\":\"/home/user/foo\" }'",
-              "additionalProperties": {
-                "type": "string"
+    "configuration": [
+      {
+        "title": "OmniSharp",
+        "properties": {
+          "dotnet.server.useOmnisharp": {
+            "type": "boolean",
+            "default": false,
+            "description": "Switches to use the Omnisharp server for language features when enabled (requires restart). This option will not be honored with C# Dev Kit installed.",
+            "order": 0
+          },
+          "csharp.format.enable": {
+            "type": "boolean",
+            "default": true,
+            "description": "Enable/disable default C# formatter (requires restart)."
+          },
+          "csharp.suppressDotnetInstallWarning": {
+            "type": "boolean",
+            "default": false,
+            "description": "Suppress the warning that the .NET Core SDK is not on the path."
+          },
+          "csharp.suppressDotnetRestoreNotification": {
+            "type": "boolean",
+            "default": false,
+            "description": "Suppress the notification window to perform a 'dotnet restore' when dependencies can't be resolved."
+          },
+          "csharp.suppressProjectJsonWarning": {
+            "type": "boolean",
+            "default": false,
+            "description": "Suppress the warning that project.json is no longer a supported project format for .NET Core applications"
+          },
+          "csharp.suppressBuildAssetsNotification": {
+            "type": "boolean",
+            "default": false,
+            "description": "Suppress the notification window to add missing assets to build or debug the application."
+          },
+          "csharp.suppressHiddenDiagnostics": {
+            "type": "boolean",
+            "default": true,
+            "description": "Suppress 'hidden' diagnostics (such as 'unnecessary using directives') from appearing in the editor or the Problems pane."
+          },
+          "csharp.referencesCodeLens.filteredSymbols": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "default": [],
+            "description": "Array of custom symbol names for which CodeLens should be disabled."
+          },
+          "csharp.maxProjectFileCountForDiagnosticAnalysis": {
+            "type": "number",
+            "default": 1000,
+            "description": "Specifies the maximum number of files for which diagnostics are reported for the whole workspace. If this limit is exceeded, diagnostics will be shown for currently opened files only. Specify 0 or less to disable the limit completely."
+          },
+          "csharp.semanticHighlighting.enabled": {
+            "type": "boolean",
+            "default": true,
+            "description": "Enable/disable Semantic Highlighting for C# files (Razor files currently unsupported). Defaults to false. Close open files for changes to take effect.",
+            "scope": "window"
+          },
+          "csharp.showOmnisharpLogOnError": {
+            "type": "boolean",
+            "default": true,
+            "description": "Shows the OmniSharp log in the Output pane when OmniSharp reports an error."
+          },
+          "omnisharp.useModernNet": {
+            "type": "boolean",
+            "default": true,
+            "scope": "window",
+            "title": "Use .NET 6 build of OmniSharp",
+            "description": "Use OmniSharp build for .NET 6. This version _does not_ support non-SDK-style .NET Framework projects, including Unity. SDK-style Framework, .NET Core, and .NET 5+ projects should see significant performance improvements."
+          },
+          "omnisharp.sdkPath": {
+            "type": "string",
+            "scope": "window",
+            "description": "Specifies the path to a .NET SDK installation to use for project loading instead of the highest version installed. Applies when \"useModernNet\" is set to true. Example: /home/username/dotnet/sdks/6.0.300."
+          },
+          "omnisharp.sdkVersion": {
+            "type": "string",
+            "scope": "window",
+            "description": "Specifies the version of the .NET SDK to use for project loading instead of the highest version installed. Applies when \"useModernNet\" is set to true. Example: 6.0.300."
+          },
+          "omnisharp.sdkIncludePrereleases": {
+            "type": "boolean",
+            "scope": "window",
+            "default": true,
+            "description": "Specifies whether to include preview versions of the .NET SDK when determining which version to use for project loading. Applies when \"useModernNet\" is set to true."
+          },
+          "omnisharp.monoPath": {
+            "type": "string",
+            "scope": "machine",
+            "description": "Specifies the path to a mono installation to use when \"useModernNet\" is set to false, instead of the default system one. Example: \"/Library/Frameworks/Mono.framework/Versions/Current\""
+          },
+          "omnisharp.loggingLevel": {
+            "type": "string",
+            "default": "information",
+            "enum": [
+              "trace",
+              "debug",
+              "information",
+              "warning",
+              "error",
+              "critical"
+            ],
+            "description": "Specifies the level of logging output from the OmniSharp server."
+          },
+          "omnisharp.autoStart": {
+            "type": "boolean",
+            "default": true,
+            "description": "Specifies whether the OmniSharp server will be automatically started or not. If false, OmniSharp can be started with the 'Restart OmniSharp' command"
+          },
+          "omnisharp.projectFilesExcludePattern": {
+            "type": "string",
+            "default": "**/node_modules/**,**/.git/**,**/bower_components/**",
+            "description": "The exclude pattern used by OmniSharp to find all project files."
+          },
+          "omnisharp.projectLoadTimeout": {
+            "type": "number",
+            "default": 60,
+            "description": "The time Visual Studio Code will wait for the OmniSharp server to start. Time is expressed in seconds."
+          },
+          "omnisharp.maxProjectResults": {
+            "type": "number",
+            "default": 250,
+            "description": "The maximum number of projects to be shown in the 'Select Project' dropdown (maximum 250)."
+          },
+          "omnisharp.useEditorFormattingSettings": {
+            "type": "boolean",
+            "default": true,
+            "description": "Specifes whether OmniSharp should use VS Code editor settings for C# code formatting (use of tabs, indentation size)."
+          },
+          "omnisharp.minFindSymbolsFilterLength": {
+            "type": "number",
+            "default": 0,
+            "description": "The minimum number of characters to enter before 'Go to Symbol in Workspace' operation shows any results."
+          },
+          "omnisharp.maxFindSymbolsItems": {
+            "type": "number",
+            "default": 1000,
+            "description": "The maximum number of items that 'Go to Symbol in Workspace' operation can show. The limit is applied only when a positive number is specified here."
+          },
+          "omnisharp.disableMSBuildDiagnosticWarning": {
+            "type": "boolean",
+            "default": false,
+            "description": "Specifies whether notifications should be shown if OmniSharp encounters warnings or errors loading a project. Note that these warnings/errors are always emitted to the OmniSharp log"
+          },
+          "omnisharp.enableMsBuildLoadProjectsOnDemand": {
+            "type": "boolean",
+            "default": false,
+            "description": "If true, MSBuild project system will only load projects for files that were opened in the editor. This setting is useful for big C# codebases and allows for faster initialization of code navigation features only for projects that are relevant to code that is being edited. With this setting enabled OmniSharp may load fewer projects and may thus display incomplete reference lists for symbols."
+          },
+          "omnisharp.enableEditorConfigSupport": {
+            "type": "boolean",
+            "default": true,
+            "description": "Enables support for reading code style, naming convention and analyzer settings from .editorconfig."
+          },
+          "omnisharp.enableDecompilationSupport": {
+            "type": "boolean",
+            "default": false,
+            "scope": "machine",
+            "description": "Enables support for decompiling external references instead of viewing metadata."
+          },
+          "omnisharp.enableLspDriver": {
+            "type": "boolean",
+            "default": false,
+            "description": "Enables support for the experimental language protocol based engine (requires reload to setup bindings correctly)"
+          },
+          "omnisharp.organizeImportsOnFormat": {
+            "type": "boolean",
+            "default": false,
+            "description": "Specifies whether 'using' directives should be grouped and sorted during document formatting."
+          },
+          "omnisharp.enableAsyncCompletion": {
+            "type": "boolean",
+            "default": false,
+            "description": "(EXPERIMENTAL) Enables support for resolving completion edits asynchronously. This can speed up time to show the completion list, particularly override and partial method completion lists, at the cost of slight delays after inserting a completion item. Most completion items will have no noticeable impact with this feature, but typing immediately after inserting an override or partial method completion, before the insert is completed, can have unpredictable results."
+          },
+          "omnisharp.dotNetCliPaths": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Paths to a local download of the .NET CLI to use for running any user code.",
+            "uniqueItems": true
+          },
+          "razor.plugin.path": {
+            "type": "string",
+            "scope": "machine",
+            "description": "Overrides the path to the Razor plugin dll."
+          },
+          "razor.devmode": {
+            "type": "boolean",
+            "default": false,
+            "description": "Forces the omnisharp-vscode extension to run in a mode that enables local Razor.VSCode deving."
+          },
+          "razor.format.enable": {
+            "type": "boolean",
+            "scope": "window",
+            "default": true,
+            "description": "Enable/disable default Razor formatter."
+          },
+          "razor.completion.commitElementsWithSpace": {
+            "type": "boolean",
+            "scope": "window",
+            "default": "false",
+            "description": "Specifies whether to commit tag helper and component elements with a space."
+          }
+        }
+      },
+      {
+        "title": "C#",
+        "properties": {
+          "dotnet.defaultSolution": {
+            "type": "string",
+            "description": "%configuration.dotnet.defaultSolution.description%",
+            "order": 0
+          },
+          "dotnet.dotnetPath": {
+            "type": "string",
+            "scope": "machine-overridable",
+            "description": "%configuration.dotnet.dotnetPath%"
+          },
+          "dotnet.server.path": {
+            "type": "string",
+            "scope": "machine-overridable",
+            "description": "%configuration.dotnet.server.path%"
+          },
+          "dotnet.server.startTimeout": {
+            "type": "number",
+            "scope": "machine-overridable",
+            "default": 30000,
+            "description": "%configuration.dotnet.server.startTimeout%"
+          },
+          "dotnet.server.waitForDebugger": {
+            "type": "boolean",
+            "scope": "machine-overridable",
+            "default": false,
+            "description": "%configuration.dotnet.server.waitForDebugger%"
+          },
+          "dotnet.server.trace": {
+            "scope": "window",
+            "type": "string",
+            "enum": [
+              "Trace",
+              "Debug",
+              "Information",
+              "Warning",
+              "Error",
+              "Critical",
+              "None"
+            ],
+            "default": "Information",
+            "description": "%configuration.dotnet.server.trace%"
+          },
+          "dotnet.server.extensionPaths": {
+            "scope": "machine-overridable",
+            "type": [
+              "array",
+              null
+            ],
+            "items": {
+              "type": "string"
+            },
+            "default": null,
+            "description": "%configuration.dotnet.server.extensionPaths%"
+          },
+          "dotnet.server.crashDumpPath": {
+            "scope": "machine-overridable",
+            "type": "string",
+            "default": null,
+            "description": "%configuration.dotnet.server.crashDumpPath%"
+          },
+          "dotnet.projects.binaryLogPath": {
+            "scope": "machine-overridable",
+            "type": "string",
+            "default": null,
+            "description": "Sets a path where MSBuild binary logs are written to when loading projects, to help diagnose loading errors."
+          },
+          "dotnet.preferCSharpExtension": {
+            "scope": "resource",
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.preferCSharpExtension%"
+          },
+          "dotnet.implementType.insertionBehavior": {
+            "type": "string",
+            "enum": [
+              "withOtherMembersOfTheSameKind",
+              "atTheEnd"
+            ],
+            "default": "withOtherMembersOfTheSameKind",
+            "enumDescriptions": [
+              "%configuration.dotnet.implementType.insertionBehavior.withOtherMembersOfTheSameKind%",
+              "%configuration.dotnet.implementType.insertionBehavior.atTheEnd%"
+            ],
+            "description": "%configuration.dotnet.implementType.insertionBehavior%",
+            "order": 10
+          },
+          "dotnet.implementType.propertyGenerationBehavior": {
+            "type": "string",
+            "enum": [
+              "preferThrowingProperties",
+              "preferAutoProperties"
+            ],
+            "default": "preferThrowingProperties",
+            "enumDescriptions": [
+              "%configuration.dotnet.implementType.propertyGenerationBehavior.preferThrowingProperties%",
+              "%configuration.dotnet.implementType.propertyGenerationBehavior.preferAutoProperties%"
+            ],
+            "description": "%configuration.dotnet.implementType.propertyGenerationBehavior%",
+            "order": 10
+          },
+          "dotnet.codeLens.enableReferencesCodeLens": {
+            "type": "boolean",
+            "default": true,
+            "description": "%configuration.dotnet.codeLens.enableReferencesCodeLens%"
+          },
+          "dotnet.codeLens.enableTestsCodeLens": {
+            "type": "boolean",
+            "default": true,
+            "description": "%configuration.dotnet.codeLens.enableTestsCodeLens%"
+          },
+          "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": {
+            "type": "boolean",
+            "default": true,
+            "description": "%configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces%",
+            "order": 20
+          },
+          "dotnet.completion.showNameCompletionSuggestions": {
+            "type": "boolean",
+            "default": "true",
+            "description": "%configuration.dotnet.completion.showNameCompletionSuggestions%",
+            "order": 20
+          },
+          "dotnet.completion.provideRegexCompletions": {
+            "type": "boolean",
+            "default": "true",
+            "description": "%configuration.dotnet.completion.provideRegexCompletions%",
+            "order": 20
+          },
+          "dotnet.backgroundAnalysis.analyzerDiagnosticsScope": {
+            "type": "string",
+            "enum": [
+              "openFiles",
+              "fullSolution",
+              "none"
+            ],
+            "default": "openFiles",
+            "enumDescriptions": [
+              "%configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles%",
+              "%configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution%",
+              "%configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none%"
+            ],
+            "description": "%configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope%",
+            "order": 30
+          },
+          "dotnet.backgroundAnalysis.compilerDiagnosticsScope": {
+            "type": "string",
+            "enum": [
+              "openFiles",
+              "fullSolution",
+              "none"
+            ],
+            "default": "openFiles",
+            "enumDescriptions": [
+              "%configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles%",
+              "%configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution%",
+              "%configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none%"
+            ],
+            "description": "%configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope%",
+            "order": 30
+          },
+          "dotnet.highlighting.highlightRelatedRegexComponents": {
+            "type": "boolean",
+            "default": "true",
+            "description": "%configuration.dotnet.highlighting.highlightRelatedRegexComponents%",
+            "order": 40
+          },
+          "dotnet.highlighting.highlightRelatedJsonComponents": {
+            "type": "boolean",
+            "default": "true",
+            "description": "%configuration.dotnet.highlighting.highlightRelatedJsonComponents%",
+            "order": 40
+          },
+          "csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation%",
+            "order": 50
+          },
+          "csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes%",
+            "order": 50
+          },
+          "csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes%",
+            "order": 50
+          },
+          "csharp.inlayHints.enableInlayHintsForTypes": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.csharp.inlayHints.enableInlayHintsForTypes%",
+            "order": 50
+          },
+          "dotnet.inlayHints.enableInlayHintsForIndexerParameters": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters%",
+            "order": 50
+          },
+          "dotnet.inlayHints.enableInlayHintsForLiteralParameters": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.enableInlayHintsForLiteralParameters%",
+            "order": 50
+          },
+          "dotnet.inlayHints.enableInlayHintsForObjectCreationParameters": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.enableInlayHintsForObjectCreationParameters%",
+            "order": 50
+          },
+          "dotnet.inlayHints.enableInlayHintsForOtherParameters": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.enableInlayHintsForOtherParameters%",
+            "order": 50
+          },
+          "dotnet.inlayHints.enableInlayHintsForParameters": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.enableInlayHintsForParameters%",
+            "order": 50
+          },
+          "dotnet.inlayHints.suppressInlayHintsForParametersThatDifferOnlyBySuffix": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatDifferOnlyBySuffix%",
+            "order": 50
+          },
+          "dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName%",
+            "order": 50
+          },
+          "dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent%",
+            "order": 50
+          },
+          "dotnet.navigation.navigateToDecompiledSources": {
+            "type": "boolean",
+            "default": "true",
+            "description": "%configuration.dotnet.navigation.navigateToDecompiledSources%",
+            "order": 60
+          },
+          "dotnet.quickInfo.showRemarksInQuickInfo": {
+            "type": "boolean",
+            "default": "true",
+            "description": "%configuration.dotnet.quickInfo.showRemarksInQuickInfo%",
+            "order": 70
+          },
+          "dotnet.symbolSearch.searchReferenceAssemblies": {
+            "type": "boolean",
+            "default": true,
+            "description": "%configuration.dotnet.symbolSearch.searchReferenceAssemblies%",
+            "order": 80
+          },
+          "dotnet.unitTests.runSettingsPath": {
+            "type": "string",
+            "description": "Path to the .runsettings file which should be used when running unit tests. (Previously `omnisharp.testRunSettings`)"
+          },
+          "dotnet.unitTestDebuggingOptions": {
+            "type": "object",
+            "description": "%configuration.dotnet.unitTestDebuggingOptions%",
+            "default": {},
+            "properties": {
+              "sourceFileMap": {
+                "type": "object",
+                "markdownDescription": "%generateOptionsSchema.sourceFileMap.markdownDescription%",
+                "additionalProperties": {
+                  "type": "string"
+                }
               },
-              "default": {
-                "<insert-source-path-here>": "<insert-target-path-here>"
+              "justMyCode": {
+                "type": "boolean",
+                "markdownDescription": "%generateOptionsSchema.justMyCode.markdownDescription%",
+                "default": true
+              },
+              "requireExactSource": {
+                "type": "boolean",
+                "markdownDescription": "%generateOptionsSchema.requireExactSource.markdownDescription%",
+                "default": true
+              },
+              "enableStepFiltering": {
+                "type": "boolean",
+                "markdownDescription": "%generateOptionsSchema.enableStepFiltering.markdownDescription%",
+                "default": true
+              },
+              "logging": {
+                "description": "%generateOptionsSchema.logging.description%",
+                "type": "object",
+                "required": [],
+                "default": {},
+                "properties": {
+                  "exceptions": {
+                    "type": "boolean",
+                    "markdownDescription": "%generateOptionsSchema.logging.exceptions.markdownDescription%",
+                    "default": true
+                  },
+                  "moduleLoad": {
+                    "type": "boolean",
+                    "markdownDescription": "%generateOptionsSchema.logging.moduleLoad.markdownDescription%",
+                    "default": true
+                  },
+                  "programOutput": {
+                    "type": "boolean",
+                    "markdownDescription": "%generateOptionsSchema.logging.programOutput.markdownDescription%",
+                    "default": true
+                  },
+                  "threadExit": {
+                    "type": "boolean",
+                    "markdownDescription": "%generateOptionsSchema.logging.threadExit.markdownDescription%",
+                    "default": false
+                  },
+                  "processExit": {
+                    "type": "boolean",
+                    "markdownDescription": "%generateOptionsSchema.logging.processExit.markdownDescription%",
+                    "default": true
+                  }
+                }
+              },
+              "suppressJITOptimizations": {
+                "type": "boolean",
+                "markdownDescription": "%generateOptionsSchema.suppressJITOptimizations.markdownDescription%",
+                "default": false
+              },
+              "symbolOptions": {
+                "description": "%generateOptionsSchema.symbolOptions.description%",
+                "default": {
+                  "searchPaths": [],
+                  "searchMicrosoftSymbolServer": false,
+                  "searchNuGetOrgSymbolServer": false
+                },
+                "type": "object",
+                "properties": {
+                  "searchPaths": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "%generateOptionsSchema.symbolOptions.searchPaths.description%",
+                    "default": []
+                  },
+                  "searchMicrosoftSymbolServer": {
+                    "type": "boolean",
+                    "description": "%generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description%",
+                    "default": false
+                  },
+                  "searchNuGetOrgSymbolServer": {
+                    "type": "boolean",
+                    "description": "%generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description%",
+                    "default": false
+                  },
+                  "cachePath": {
+                    "type": "string",
+                    "description": "%generateOptionsSchema.symbolOptions.cachePath.description%",
+                    "default": ""
+                  },
+                  "moduleFilter": {
+                    "description": "%generateOptionsSchema.symbolOptions.moduleFilter.description%",
+                    "default": {
+                      "mode": "loadAllButExcluded",
+                      "excludedModules": []
+                    },
+                    "type": "object",
+                    "required": [
+                      "mode"
+                    ],
+                    "properties": {
+                      "mode": {
+                        "type": "string",
+                        "enum": [
+                          "loadAllButExcluded",
+                          "loadOnlyIncluded"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription%",
+                          "%generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription%"
+                        ],
+                        "description": "%generateOptionsSchema.symbolOptions.moduleFilter.mode.description%",
+                        "default": "loadAllButExcluded"
+                      },
+                      "excludedModules": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        },
+                        "description": "%generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description%",
+                        "default": []
+                      },
+                      "includedModules": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        },
+                        "description": "%generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description%",
+                        "default": []
+                      },
+                      "includeSymbolsNextToModules": {
+                        "type": "boolean",
+                        "description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
+                        "default": true
+                      }
+                    }
+                  }
+                }
+              },
+              "sourceLinkOptions": {
+                "markdownDescription": "%generateOptionsSchema.sourceLinkOptions.markdownDescription%",
+                "default": {
+                  "*": {
+                    "enabled": true
+                  }
+                },
+                "type": "object",
+                "additionalItems": {
+                  "type": "object",
+                  "properties": {
+                    "enabled": {
+                      "title": "boolean",
+                      "markdownDescription": "%generateOptionsSchema.sourceLinkOptions.additionalItems.enabled.markdownDescription%",
+                      "default": "true"
+                    }
+                  }
+                }
+              },
+              "allowFastEvaluate": {
+                "type": "boolean",
+                "description": "%generateOptionsSchema.allowFastEvaluate.description%",
+                "default": true
+              },
+              "targetArchitecture": {
+                "type": "string",
+                "markdownDescription": "%generateOptionsSchema.targetArchitecture.markdownDescription%",
+                "enum": [
+                  "x86_64",
+                  "arm64"
+                ]
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "coreclr",
+                  "clr"
+                ],
+                "description": "Type type of code to debug. Can be either 'coreclr' for .NET Core debugging, or 'clr' for Desktop .NET Framework. 'clr' only works on Windows as the Desktop framework is Windows-only.",
+                "default": "coreclr"
+              },
+              "debugServer": {
+                "type": "number",
+                "description": "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode",
+                "default": 4711
               }
             },
             "justMyCode": {
@@ -1039,6 +1687,237 @@
               "description": "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode",
               "default": 4711
             }
+          },
+          "razor.languageServer.directory": {
+            "type": "string",
+            "scope": "machine-overridable",
+            "description": "%configuration.razor.languageServer.directory%",
+            "order": 90
+          },
+          "razor.languageServer.debug": {
+            "type": "boolean",
+            "scope": "machine-overridable",
+            "default": false,
+            "description": "%configuration.razor.languageServer.debug%",
+            "order": 90
+          },
+          "razor.trace": {
+            "type": "string",
+            "default": "Off",
+            "enum": [
+              "Off",
+              "Messages",
+              "Verbose"
+            ],
+            "enumDescriptions": [
+              "%configuration.razor.trace.off%",
+              "%configuration.razor.trace.messages%",
+              "%configuration.razor.trace.verbose%"
+            ],
+            "description": "%configuration.razor.trace%",
+            "order": 90
+          },
+          "csharp.debug.stopAtEntry": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.stopAtEntry.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.console": {
+            "type": "string",
+            "enum": [
+              "internalConsole",
+              "integratedTerminal",
+              "externalTerminal"
+            ],
+            "enumDescriptions": [
+              "%generateOptionsSchema.console.internalConsole.enumDescription%",
+              "%generateOptionsSchema.console.integratedTerminal.enumDescription%",
+              "%generateOptionsSchema.console.externalTerminal.enumDescription%"
+            ],
+            "markdownDescription": "%generateOptionsSchema.console.settingsDescription%",
+            "default": "internalConsole"
+          },
+          "csharp.debug.sourceFileMap": {
+            "type": "object",
+            "markdownDescription": "%generateOptionsSchema.sourceFileMap.markdownDescription%",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "default": {}
+          },
+          "csharp.debug.justMyCode": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.justMyCode.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.requireExactSource": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.requireExactSource.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.enableStepFiltering": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.enableStepFiltering.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.logging.exceptions": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.exceptions.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.logging.moduleLoad": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.moduleLoad.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.logging.programOutput": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.programOutput.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.logging.browserStdOut": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.browserStdOut.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.logging.elapsedTiming": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.elapsedTiming.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.logging.threadExit": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.threadExit.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.logging.processExit": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.processExit.markdownDescription%",
+            "default": true
+          },
+          "csharp.debug.logging.engineLogging": {
+            "type": "boolean",
+            "deprecationMessage": "%generateOptionsSchema.logging.engineLogging.deprecationMessage%",
+            "default": false
+          },
+          "csharp.debug.logging.diagnosticsLog.protocolMessages": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.logging.diagnosticsLog.dispatcherMessages": {
+            "type": "string",
+            "enum": [
+              "none",
+              "error",
+              "important",
+              "normal"
+            ],
+            "enumDescriptions": [
+              "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription%",
+              "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription%",
+              "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription%",
+              "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription%"
+            ],
+            "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription%",
+            "default": "none"
+          },
+          "csharp.debug.logging.diagnosticsLog.debugEngineAPITracing": {
+            "type": "string",
+            "enum": [
+              "none",
+              "error",
+              "all"
+            ],
+            "enumDescriptions": [
+              "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription%",
+              "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription%",
+              "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription%"
+            ],
+            "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription%",
+            "default": "none"
+          },
+          "csharp.debug.logging.diagnosticsLog.debugRuntimeEventTracing": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.logging.diagnosticsLog.expressionEvaluationTracing": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.logging.diagnosticsLog.startDebuggingTracing": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.suppressJITOptimizations": {
+            "type": "boolean",
+            "markdownDescription": "%generateOptionsSchema.suppressJITOptimizations.markdownDescription%",
+            "default": false
+          },
+          "csharp.debug.symbolOptions.searchPaths": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "%generateOptionsSchema.symbolOptions.searchPaths.description%",
+            "default": []
+          },
+          "csharp.debug.symbolOptions.searchMicrosoftSymbolServer": {
+            "type": "boolean",
+            "description": "%generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description%",
+            "default": false
+          },
+          "csharp.debug.symbolOptions.searchNuGetOrgSymbolServer": {
+            "type": "boolean",
+            "description": "%generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description%",
+            "default": false
+          },
+          "csharp.debug.symbolOptions.cachePath": {
+            "type": "string",
+            "description": "%generateOptionsSchema.symbolOptions.cachePath.description%",
+            "default": ""
+          },
+          "csharp.debug.symbolOptions.moduleFilter.mode": {
+            "type": "string",
+            "enum": [
+              "loadAllButExcluded",
+              "loadOnlyIncluded"
+            ],
+            "enumDescriptions": [
+              "%generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription%",
+              "%generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription%"
+            ],
+            "description": "%generateOptionsSchema.symbolOptions.moduleFilter.mode.description%",
+            "default": "loadAllButExcluded"
+          },
+          "csharp.debug.symbolOptions.moduleFilter.excludedModules": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "%generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description%",
+            "default": []
+          },
+          "csharp.debug.symbolOptions.moduleFilter.includedModules": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "%generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description%",
+            "default": []
+          },
+          "csharp.debug.symbolOptions.moduleFilter.includeSymbolsNextToModules": {
+            "type": "boolean",
+            "description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
+            "default": true
+          },
+          "csharp.debug.allowFastEvaluate": {
+            "type": "boolean",
+            "description": "%generateOptionsSchema.allowFastEvaluate.description%",
+            "default": true
           }
         },
         "csharp.suppressDotnetRestoreNotification": {
@@ -1355,7 +2234,7 @@
           "description": "Enable/disable default Razor formatter."
         }
       }
-    },
+    ],
     "jsonValidation": [
       {
         "fileMatch": [
@@ -1384,135 +2263,135 @@
     "commands": [
       {
         "command": "o.restart",
-        "title": "Restart OmniSharp",
+        "title": "%command.o.restart%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "o.pickProjectAndStart",
-        "title": "Select Project",
+        "title": "%command.o.pickProjectAndStart%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "dotnet.openSolution",
-        "title": "Open Solution",
+        "title": "%command.dotnet.openSolution%",
         "category": ".NET",
         "enablement": "!config.dotnet.server.useOmnisharp && dotnet.server.activatedStandalone"
       },
       {
         "command": "o.fixAll.solution",
-        "title": "Fix all occurrences of a code issue within solution",
+        "title": "%command.o.fixAll.solution%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "o.fixAll.project",
-        "title": "Fix all occurrences of a code issue within project",
+        "title": "%command.o.fixAll.project%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "o.fixAll.document",
-        "title": "Fix all occurrences of a code issue within document",
+        "title": "%command.o.fixAll.document%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "o.reanalyze.allProjects",
-        "title": "Analyze all projects",
+        "title": "%command.o.reanalyze.allProjects%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "o.reanalyze.currentProject",
-        "title": "Analyze current project",
+        "title": "%command.o.reanalyze.currentProject%",
         "category": "OmniSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "dotnet.generateAssets",
-        "title": "Generate Assets for Build and Debug",
+        "title": "%command.dotnet.generateAssets.currentProject%",
         "category": ".NET"
       },
       {
         "command": "dotnet.restore.project",
-        "title": "Restore Project",
+        "title": "%command.dotnet.restore.project%",
         "category": ".NET",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "dotnet.restore.all",
-        "title": "Restore All Projects",
+        "title": "%command.dotnet.restore.all%",
         "category": ".NET",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "csharp.downloadDebugger",
-        "title": "Download .NET Core Debugger",
+        "title": "%command.csharp.downloadDebugger%",
         "category": "Debug"
       },
       {
         "command": "csharp.listProcess",
-        "title": "List process for attach",
+        "title": "%command.csharp.listProcess%",
         "category": "CSharp"
       },
       {
         "command": "csharp.listRemoteProcess",
-        "title": "List processes on remote connection for attach",
+        "title": "%command.csharp.listRemoteProcess%",
         "category": "CSharp"
       },
       {
         "command": "csharp.listRemoteDockerProcess",
-        "title": "List processes on Docker connection",
+        "title": "%command.csharp.listRemoteDockerProcess%",
         "category": "CSharp"
       },
       {
         "command": "csharp.attachToProcess",
-        "title": "Attach to a .NET 5+ or .NET Core process",
+        "title": "%command.csharp.attachToProcess%",
         "category": "Debug"
       },
       {
         "command": "csharp.reportIssue",
-        "title": "Report an issue",
+        "title": "%command.csharp.reportIssue%",
         "category": "CSharp"
       },
       {
         "command": "csharp.showDecompilationTerms",
-        "title": "Show the decompiler terms agreement",
+        "title": "%command.csharp.showDecompilationTerms%",
         "category": "CSharp",
         "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "extension.showRazorCSharpWindow",
-        "title": "Show Razor CSharp",
+        "title": "%command.extension.showRazorCSharpWindow%",
         "category": "Razor"
       },
       {
         "command": "extension.showRazorHtmlWindow",
-        "title": "Show Razor Html",
+        "title": "%command.extension.showRazorHtmlWindow%",
         "category": "Razor"
       },
       {
         "command": "razor.reportIssue",
-        "title": "Report a Razor issue",
+        "title": "%command.razor.reportIssue%",
         "category": "Razor"
       },
       {
         "command": "dotnet.test.runTestsInContext",
-        "title": "Run Tests in Context",
+        "title": "%command.dotnet.test.runTestsInContext%",
         "category": ".NET",
         "enablement": "dotnet.server.activatedStandalone"
       },
       {
         "command": "dotnet.test.debugTestsInContext",
-        "title": "Debug Tests in Context",
+        "title": "%command.dotnet.test.debugTestsInContext%",
         "category": ".NET",
         "enablement": "dotnet.server.activatedStandalone"
       },
       {
         "command": "dotnet.restartServer",
-        "title": "Restart Language Server",
+        "title": "%command.dotnet.restartServer%",
         "category": ".NET",
         "enablement": "!config.dotnet.server.useOmnisharp"
       }
@@ -1548,6 +2427,7 @@
       {
         "type": "coreclr",
         "label": ".NET 5+ and .NET Core",
+        "hiddenWhen": "dotnet.debug.serviceBrokerAvailable",
         "languages": [
           "csharp",
           "razor",
@@ -1785,11 +2665,6 @@
                     "markdownDescription": "%generateOptionsSchema.logging.programOutput.markdownDescription%",
                     "default": true
                   },
-                  "engineLogging": {
-                    "type": "boolean",
-                    "markdownDescription": "%generateOptionsSchema.logging.engineLogging.markdownDescription%",
-                    "default": false
-                  },
                   "browserStdOut": {
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.browserStdOut.markdownDescription%",
@@ -1809,6 +2684,71 @@
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.processExit.markdownDescription%",
                     "default": true
+                  },
+                  "engineLogging": {
+                    "type": "boolean",
+                    "deprecationMessage": "%generateOptionsSchema.logging.engineLogging.deprecationMessage%",
+                    "default": false
+                  },
+                  "diagnosticsLog": {
+                    "description": "%generateOptionsSchema.logging.diagnosticsLog.description%",
+                    "type": "object",
+                    "required": [],
+                    "default": {},
+                    "properties": {
+                      "protocolMessages": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription%",
+                        "default": false
+                      },
+                      "dispatcherMessages": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "important",
+                          "normal"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugEngineAPITracing": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "all"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugRuntimeEventTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "expressionEvaluationTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "startDebuggingTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription%",
+                        "default": false
+                      }
+                    }
                   }
                 }
               },
@@ -2225,11 +3165,6 @@
                     "markdownDescription": "%generateOptionsSchema.logging.programOutput.markdownDescription%",
                     "default": true
                   },
-                  "engineLogging": {
-                    "type": "boolean",
-                    "markdownDescription": "%generateOptionsSchema.logging.engineLogging.markdownDescription%",
-                    "default": false
-                  },
                   "browserStdOut": {
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.browserStdOut.markdownDescription%",
@@ -2249,6 +3184,71 @@
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.processExit.markdownDescription%",
                     "default": true
+                  },
+                  "engineLogging": {
+                    "type": "boolean",
+                    "deprecationMessage": "%generateOptionsSchema.logging.engineLogging.deprecationMessage%",
+                    "default": false
+                  },
+                  "diagnosticsLog": {
+                    "description": "%generateOptionsSchema.logging.diagnosticsLog.description%",
+                    "type": "object",
+                    "required": [],
+                    "default": {},
+                    "properties": {
+                      "protocolMessages": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription%",
+                        "default": false
+                      },
+                      "dispatcherMessages": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "important",
+                          "normal"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugEngineAPITracing": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "all"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugRuntimeEventTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "expressionEvaluationTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "startDebuggingTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription%",
+                        "default": false
+                      }
+                    }
                   }
                 }
               },
@@ -2592,8 +3592,8 @@
         },
         "configurationSnippets": [
           {
-            "label": ".NET: Launch .NET Core Console App",
-            "description": "Launch a .NET Core Console App with a debugger.",
+            "label": "%debuggers.coreclr.configurationSnippets.label.console-local%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.console-local%",
             "body": {
               "name": ".NET Core Launch (console)",
               "type": "coreclr",
@@ -2607,8 +3607,8 @@
             }
           },
           {
-            "label": ".NET: Attach to local .NET Core Console App",
-            "description": "Attach a debugger to a .NET Core Console App.",
+            "label": "%debuggers.coreclr.configurationSnippets.label.attach-local%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.attach%",
             "body": {
               "name": ".NET Core Attach",
               "type": "coreclr",
@@ -2616,8 +3616,8 @@
             }
           },
           {
-            "label": ".NET: Launch a local .NET Core Web App",
-            "description": "Launch a .NET Core Web App with both a browser and a debugger.",
+            "label": "%debuggers.coreclr.configurationSnippets.label.web-local%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.web-local%",
             "body": {
               "name": ".NET Core Launch (web)",
               "type": "coreclr",
@@ -2640,8 +3640,8 @@
             }
           },
           {
-            "label": ".NET: Launch a remote .NET Core Console App",
-            "description": "Launch a .NET Core Console App on a remote machine.",
+            "label": "%debuggers.coreclr.configurationSnippets.label.console-remote%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.remote%",
             "body": {
               "name": ".NET Core Launch (console)",
               "type": "coreclr",
@@ -2661,8 +3661,8 @@
             }
           },
           {
-            "label": ".NET: Attach to remote .NET Core Console App",
-            "description": "Attach a debugger to a .NET Core Console App on a remote machine.",
+            "label": "%debuggers.coreclr.configurationSnippets.label.attach-remote%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.remote%",
             "body": {
               "name": ".NET Core Attach",
               "type": "coreclr",
@@ -2676,8 +3676,8 @@
             }
           },
           {
-            "label": ".NET: Launch and Debug Hosted Blazor WebAssembly App",
-            "description": "Launches a Hosted Blazor WebAssembly App with a debugger",
+            "label": "%debuggers.coreclr.configurationSnippets.label.blazor-hosted%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.blazor-hosted%",
             "body": {
               "name": "Launch and Debug Hosted Blazor WebAssembly App",
               "type": "blazorwasm",
@@ -2688,8 +3688,8 @@
             }
           },
           {
-            "label": ".NET: Launch and Debug Standalone Blazor WebAssembly App",
-            "description": "Launches Standalone Blazor WebAssembly App with a debugger",
+            "label": "%debuggers.coreclr.configurationSnippets.label.blazor-standalone%",
+            "description": "%debuggers.coreclr.configurationSnippets.description.blazor-standalone%",
             "body": {
               "name": "Launch and Debug Standalone Blazor WebAssembly App",
               "type": "blazorwasm",
@@ -2701,7 +3701,9 @@
       },
       {
         "type": "clr",
-        "label": ".NET Framework 4.x (Windows only)",
+        "when": "workspacePlatform == windows",
+        "hiddenWhen": "true",
+        "label": ".NET Framework 4.x",
         "languages": [
           "csharp",
           "razor",
@@ -2939,11 +3941,6 @@
                     "markdownDescription": "%generateOptionsSchema.logging.programOutput.markdownDescription%",
                     "default": true
                   },
-                  "engineLogging": {
-                    "type": "boolean",
-                    "markdownDescription": "%generateOptionsSchema.logging.engineLogging.markdownDescription%",
-                    "default": false
-                  },
                   "browserStdOut": {
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.browserStdOut.markdownDescription%",
@@ -2963,6 +3960,71 @@
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.processExit.markdownDescription%",
                     "default": true
+                  },
+                  "engineLogging": {
+                    "type": "boolean",
+                    "deprecationMessage": "%generateOptionsSchema.logging.engineLogging.deprecationMessage%",
+                    "default": false
+                  },
+                  "diagnosticsLog": {
+                    "description": "%generateOptionsSchema.logging.diagnosticsLog.description%",
+                    "type": "object",
+                    "required": [],
+                    "default": {},
+                    "properties": {
+                      "protocolMessages": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription%",
+                        "default": false
+                      },
+                      "dispatcherMessages": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "important",
+                          "normal"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugEngineAPITracing": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "all"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugRuntimeEventTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "expressionEvaluationTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "startDebuggingTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription%",
+                        "default": false
+                      }
+                    }
                   }
                 }
               },
@@ -3379,11 +4441,6 @@
                     "markdownDescription": "%generateOptionsSchema.logging.programOutput.markdownDescription%",
                     "default": true
                   },
-                  "engineLogging": {
-                    "type": "boolean",
-                    "markdownDescription": "%generateOptionsSchema.logging.engineLogging.markdownDescription%",
-                    "default": false
-                  },
                   "browserStdOut": {
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.browserStdOut.markdownDescription%",
@@ -3403,6 +4460,71 @@
                     "type": "boolean",
                     "markdownDescription": "%generateOptionsSchema.logging.processExit.markdownDescription%",
                     "default": true
+                  },
+                  "engineLogging": {
+                    "type": "boolean",
+                    "deprecationMessage": "%generateOptionsSchema.logging.engineLogging.deprecationMessage%",
+                    "default": false
+                  },
+                  "diagnosticsLog": {
+                    "description": "%generateOptionsSchema.logging.diagnosticsLog.description%",
+                    "type": "object",
+                    "required": [],
+                    "default": {},
+                    "properties": {
+                      "protocolMessages": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription%",
+                        "default": false
+                      },
+                      "dispatcherMessages": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "important",
+                          "normal"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugEngineAPITracing": {
+                        "type": "string",
+                        "enum": [
+                          "none",
+                          "error",
+                          "all"
+                        ],
+                        "enumDescriptions": [
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription%",
+                          "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription%"
+                        ],
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription%",
+                        "default": "none"
+                      },
+                      "debugRuntimeEventTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "expressionEvaluationTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription%",
+                        "default": false
+                      },
+                      "startDebuggingTracing": {
+                        "type": "boolean",
+                        "markdownDescription": "%generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription%",
+                        "default": false
+                      }
+                    }
                   }
                 }
               },
@@ -3748,6 +4870,7 @@
       {
         "type": "blazorwasm",
         "label": "Blazor WebAssembly Debug",
+        "hiddenWhen": "dotnet.debug.serviceBrokerAvailable",
         "initialConfigurations": [
           {
             "type": "blazorwasm",
@@ -3952,6 +5075,7 @@
       {
         "type": "dotnet",
         "label": "C#",
+        "hiddenWhen": "!dotnet.debug.serviceBrokerAvailable",
         "languages": [
           "csharp",
           "razor",
@@ -3978,7 +5102,18 @@
             }
           }
         },
-        "configurationSnippets": []
+        "configurationSnippets": [
+          {
+            "label": "%debuggers.dotnet.configurationSnippets.label%",
+            "description": "%debuggers.dotnet.configurationSnippets.description%",
+            "body": {
+              "name": "C#: ${1:<project-name>} Debug",
+              "type": "dotnet",
+              "request": "launch",
+              "projectPath": "^\"\\${workspaceFolder}/${2:<relative-path-to-project-folder>}${1:<project-name>}.csproj\""
+            }
+          }
+        ]
       }
     ],
     "semanticTokenTypes": [
@@ -3987,7 +5122,7 @@
         "description": "A Razor component element"
       },
       {
-        "id": "razorComponentAttribute",
+        "id": "RazorComponentAttribute",
         "description": "A Razor component attribute"
       },
       {
@@ -4038,6 +5173,14 @@
         "id": "markupAttribute",
         "description": "The name of a Markup attribute."
       },
+      {
+        "id": "markupAttributeQuote",
+        "description": "A token that represents an attribute quote in a Markup attribute."
+      },
+      {
+        "id": "markupAttributeValue",
+        "description": "The value of a Markup attribute."
+      },
       {
         "id": "markupComment",
         "description": "The contents of a Markup comment."
@@ -4293,7 +5436,7 @@
           "razorComponentElement": [
             "entity.name.class.element.component"
           ],
-          "razorComponentAttribute": [
+          "RazorComponentAttribute": [
             "entity.name.class.attribute.component"
           ],
           "razorTagHelperElement": [
@@ -4343,12 +5486,183 @@
           "markupAttribute": [
             "entity.other.attribute-name.html"
           ],
+          "markupAttributeQuote": [
+            "punctuation.definition.tag.html"
+          ],
+          "markupAttributeValue": [
+            "punctuation.definition.entity.html"
+          ],
           "markupComment": [
             "comment.block.html"
           ],
           "markupCommentPunctuation": [
             "punctuation.definition.comment.html",
             "comment.block.html"
+          ],
+          "markupTagDelimiter": [
+            "punctuation.definition.tag.html"
+          ],
+          "keyword": [
+            "keyword.cs"
+          ],
+          "excludedCode": [
+            "support.other.excluded.cs"
+          ],
+          "controlKeyword": [
+            "keyword.control.cs"
+          ],
+          "operatorOverloaded": [
+            "entity.name.function.member.overload.cs"
+          ],
+          "preprocessorText": [
+            "meta.preprocessor.string.cs"
+          ],
+          "punctuation": [
+            "punctuation.cs"
+          ],
+          "stringVerbatim": [
+            "string.verbatim.cs"
+          ],
+          "stringEscapeCharacter": [
+            "constant.character.escape.cs"
+          ],
+          "delegate": [
+            "entity.name.type.delegate.cs"
+          ],
+          "module": [
+            "entity.name.type.module.cs"
+          ],
+          "field": [
+            "entity.name.variable.field.cs"
+          ],
+          "constant": [
+            "variable.other.constant"
+          ],
+          "extensionMethod": [
+            "entity.name.function.extension.cs"
+          ],
+          "xmlDocCommentAttributeName": [
+            "comment.documentation.attribute.name.cs"
+          ],
+          "xmlDocCommentAttributeQuotes": [
+            "comment.documentation.attribute.quotes.cs"
+          ],
+          "xmlDocCommentAttributeValue": [
+            "comment.documentation.attribute.value.cs"
+          ],
+          "xmlDocCommentCDataSection": [
+            "comment.documentation.cdata.cs"
+          ],
+          "xmlDocCommentComment": [
+            "comment.documentation.comment.cs"
+          ],
+          "xmlDocCommentDelimiter": [
+            "comment.documentation.delimiter.cs"
+          ],
+          "xmlDocCommentEntityReference": [
+            "comment.documentation.entityReference.cs"
+          ],
+          "xmlDocCommentName": [
+            "comment.documentation.name.cs"
+          ],
+          "xmlDocCommentProcessingInstruction": [
+            "comment.documentation.processingInstruction.cs"
+          ],
+          "xmlDocCommentText": [
+            "comment.documentation.cs"
+          ],
+          "xmlLiteralAttributeName": [
+            "entity.other.attribute-name.localname.xml"
+          ],
+          "xmlLiteralAttributeQuotes": [
+            "string.quoted.double.xml"
+          ],
+          "xmlLiteralAttributeValue": [
+            "meta.tag.xml"
+          ],
+          "xmlLiteralCDataSection": [
+            "string.quoted.double.xml"
+          ],
+          "xmlLiteralComment": [
+            "comment.block.xml"
+          ],
+          "xmlLiteralDelimiter": [
+            "text.xml"
+          ],
+          "xmlLiteralEmbeddedExpression": [
+            "meta.tag.xml"
+          ],
+          "xmlLiteralEntityReference": [
+            "meta.tag.xml"
+          ],
+          "xmlLiteralName": [
+            "entity.name.tag.localname.xml"
+          ],
+          "xmlLiteralProcessingInstruction": [
+            "meta.tag.xml"
+          ],
+          "xmlLiteralText": [
+            "text.xml"
+          ],
+          "regexComment": [
+            "string.regexp.comment.cs"
+          ],
+          "regexCharacterClass": [
+            "constant.character.character-class.regexp.cs"
+          ],
+          "regexAnchor": [
+            "keyword.control.anchor.regexp.cs"
+          ],
+          "regexQuantifier": [
+            "keyword.operator.quantifier.regexp.cs"
+          ],
+          "regexGrouping": [
+            "punctuation.definition.group.regexp.cs"
+          ],
+          "regexAlternation": [
+            "keyword.operator.or.regexp.cs"
+          ],
+          "regexText": [
+            "string.regexp"
+          ],
+          "regexSelfEscapedCharacter": [
+            "string.regexp.self-escaped-character.cs"
+          ],
+          "regexOtherEscape": [
+            "string.regexp.other-escape.cs"
+          ],
+          "jsonComment": [
+            "comment.line.double-slash.js"
+          ],
+          "jsonNumber": [
+            "constant.numeric.json"
+          ],
+          "jsonString": [
+            "string.quoted.double.json"
+          ],
+          "jsonKeyword": [
+            "constant.language.json"
+          ],
+          "jsonText": [
+            "string.quoted.double.json"
+          ],
+          "jsonOperator": [
+            "string.quoted.double.json"
+          ],
+          "jsonPunctuation": [
+            "punctuation.separator.dictionary.key-value.json"
+          ],
+          "jsonArray": [
+            "punctuation.definition.array.begin.json"
+          ],
+          "jsonObject": [
+            "punctuation.definition.dictionary.begin.json"
+          ],
+          "jsonPropertyName": [
+            "support.type.property-name.json"
+          ],
+          "jsonConstructorName": [
+            "support.type.property-name.json"
           ]
         }
       },
@@ -4543,7 +5857,10 @@
       {
         "language": "aspnetcorerazor",
         "scopeName": "text.aspnetcorerazor",
-        "path": "./src/razor/syntaxes/aspnetcorerazor.tmLanguage.json"
+        "path": "./src/razor/syntaxes/aspnetcorerazor.tmLanguage.json",
+        "unbalancedBracketScopes": [
+          "text.aspnetcorerazor"
+        ]
       }
     ],
     "menus": {
diff --git a/package.nls.cs.json b/package.nls.cs.json
index 00ab70cf9..56db34761 100644
--- a/package.nls.cs.json
+++ b/package.nls.cs.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Připojení k procesu .NET 5+ nebo .NET Core",
+  "command.csharp.downloadDebugger": "Stáhnout ladicí program .NET Core",
+  "command.csharp.listProcess": "Vypsat proces pro připojení",
+  "command.csharp.listRemoteDockerProcess": "Výpis procesů v připojení Dockeru",
+  "command.csharp.listRemoteProcess": "Vypsat procesy pro připojení na vzdáleném připojení",
+  "command.csharp.reportIssue": "Nahlásit problém",
+  "command.csharp.showDecompilationTerms": "Zobrazit smlouvu o podmínkách dekompilátoru",
+  "command.dotnet.generateAssets.currentProject": "Generovat prostředky pro sestavení a ladění",
+  "command.dotnet.openSolution": "Otevřít řešení",
+  "command.dotnet.restartServer": "Restartovat jazykový server",
+  "command.dotnet.restore.all": "Obnovit všechny projekty",
+  "command.dotnet.restore.project": "Obnovit projekt",
+  "command.dotnet.test.debugTestsInContext": "Ladit testy v Context",
+  "command.dotnet.test.runTestsInContext": "Spustit testy v Context",
+  "command.extension.showRazorCSharpWindow": "Zobrazit Razor CSharp",
+  "command.extension.showRazorHtmlWindow": "Zobrazit Razor Html",
+  "command.o.fixAll.document": "Oprava všech výskytů problému s kódem v dokumentu",
+  "command.o.fixAll.project": "Opravit všechny výskyty problému s kódem v projektu",
+  "command.o.fixAll.solution": "Opravit všechny výskyty problému s kódem v rámci řešení",
+  "command.o.pickProjectAndStart": "Vybrat projekt",
+  "command.o.reanalyze.allProjects": "Analyzovat všechny projekty",
+  "command.o.reanalyze.currentProject": "Analyzovat aktuální projekt",
+  "command.o.restart": "Restartovat OmniSharp",
+  "command.razor.reportIssue": "Nahlásit problém s Razorem",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Zobrazit tipy pro implicitní vytvoření objektu",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Zobrazit nápovědy pro proměnné s odvozenými typy",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Zobrazit tipy pro indexery",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Zobrazit nápovědy pro typy parametrů lambda",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Zobrazovat vložené nápovědy k typům",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Spustit analýzu kódu na pozadí pro:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Spustit analýzu kódu na pozadí pro: (Dříve omnisharp.enableRoslynAnalyzers)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Celé řešení",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Žádné",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Otevřené dokumenty",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Celé řešení",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Žádné",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Otevřené dokumenty",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Určuje, zda mají být zobrazeny odkazy CodeLens.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Určuje, jestli se má zobrazit CodeLens testu spuštění a ladění.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Určuje, zda mají být zobrazeny odkazy CodeLens. (Dříve csharp.referencesCodeLens.enabled)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Určuje, jestli se má zobrazit CodeLens testu spuštění a ladění. (Dříve csharp.testsCodeLens.enabled)",
   "configuration.dotnet.completion.provideRegexCompletions": "Umožňuje zobrazit regulární výrazy v seznamu dokončení.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Povolí podporu zobrazení neimportovaných typů a neimportovaných metod rozšíření v seznamech dokončení. Při potvrzení se na začátek aktuálního souboru přidá příslušná direktiva použití.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Povolí podporu zobrazení neimportovaných typů a neimportovaných metod rozšíření v seznamech dokončení. Při potvrzení se na začátek aktuálního souboru přidá příslušná direktiva použití. (Dříve omnisharp.enableImportCompletion)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Pro členy, které jste nedávno vybrali, proveďte automatické dokončování názvů objektů.",
-  "configuration.dotnet.defaultSolution.description": "Cesta výchozího řešení, které se má otevřít v pracovním prostoru, nebo ji můžete přeskočit nastavením na „zakázat“.",
+  "configuration.dotnet.defaultSolution.description": "Cesta výchozího řešení, které se má otevřít v pracovním prostoru. Můžete přeskočit nastavením na „zakázat“. (Dříve omnisharp.defaultLaunchSolution)",
   "configuration.dotnet.dotnetPath": "Zadává cestu k adresáři instalace dotnet, která se má použít místo výchozí systémové instalace. To má vliv pouze na instalaci dotnet, která se má použít k hostování samotného jazykového serveru. Příklad: /home/username/mycustomdotnetdirectory",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zvýrazněte související komponenty JSON pod kurzorem.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zvýraznit související komponenty regulárního výrazu pod kurzorem.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Potlačit nápovědy, když argument odpovídá názvu parametru",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Potlačit nápovědy, když název parametru odpovídá záměru metody",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Povolit navigaci na dekompilované zdroje.",
+  "configuration.dotnet.preferCSharpExtension": "Vynutí načtení projektů pouze s rozšířením jazyka C#.  To může být užitečné při použití starších typů projektů, které jazyk C# Dev Kit nepodporuje. (Vyžaduje opětovné načtení okna)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Zobrazit informace o poznámkách při zobrazení symbolu.",
+  "configuration.dotnet.server.crashDumpPath": "Nastaví cestu ke složce, do které se zapisují výpisy stavu systému, pokud dojde k chybovému ukončení jazykového serveru.  Musí být zapisovatelný uživatelem.",
   "configuration.dotnet.server.extensionPaths": "Přepsat pro cestu k jazykovému serveru -- argumenty rozšíření",
-  "configuration.dotnet.server.path": "Určuje absolutní cestu ke spustitelnému souboru serveru (LSP nebo O#). Ponechání prázdné vede k použití verze připnuté k rozšíření C#.",
+  "configuration.dotnet.server.path": "Určuje absolutní cestu ke spustitelnému souboru serveru (LSP nebo O#). Ponechání prázdné vede k použití verze připnuté k rozšíření C#. (Dříve omnisharp.path)",
+  "configuration.dotnet.server.startTimeout": "Určuje časový limit (v ms), aby se klient úspěšně spustil a připojil k jazykovému serveru.",
   "configuration.dotnet.server.trace": "Nastaví úroveň protokolování pro jazykový server",
-  "configuration.dotnet.server.waitForDebugger": "Při spuštění serveru předá příznak --debug, aby bylo možné připojit ladicí program.",
+  "configuration.dotnet.server.waitForDebugger": "Při spuštění serveru předá příznak --debug, aby bylo možné připojit ladicí program. (Dříve omnisharp.waitForDebugger)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Hledat symboly v referenčních sestaveních Ovlivňuje funkce, které vyžadují vyhledávání symbolů, například přidání importů.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Možnosti, které se mají použít s ladicím programem při spouštění pro ladění testů jednotek.",
-  "configuration.razor.languageServer.debug": "Specifies whether to wait for debug attach when launching the language server.",
-  "configuration.razor.languageServer.directory": "Overrides the path to the Razor Language Server directory.",
-  "configuration.razor.trace": "Specifies whether to output all messages [Verbose], some messages [Messages] or not at all [Off].",
-  "configuration.razor.trace.messages": "Logs only some messages from the Razor extension",
-  "configuration.razor.trace.off": "Does not log messages from the Razor extension",
-  "configuration.razor.trace.verbose": "Logs all messages from the Razor extension",
+  "configuration.dotnet.unitTestDebuggingOptions": "Možnosti, které se mají použít s ladicím programem při spouštění pro ladění testů jednotek. (Dříve csharp.unitTestDebuggingOptions)",
+  "configuration.razor.languageServer.debug": "Určuje, jestli se má při spouštění jazykového serveru čekat na připojení ladění.",
+  "configuration.razor.languageServer.directory": "Přepíše cestu k adresáři jazykového serveru Razor.",
+  "configuration.razor.trace": "Určuje, jestli se mají vypisovat všechny zprávy [Verbose], některé zprávy [Messages] nebo vůbec [Off].",
+  "configuration.razor.trace.messages": "Zaznamená jenom některé zprávy z rozšíření Razor",
+  "configuration.razor.trace.off": "Nezaznamenává zprávy z rozšíření Razor",
+  "configuration.razor.trace.verbose": "Zaznamenává zprávy z rozšíření Razor",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Připojte ladicí program .NET (coreclr) ke spuštěným procesům. Můžete to provést také pomocí příkazu „Připojit k procesu .NET 5+ nebo .NET Core“.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Tento fragment kódu se používá ke spuštění nového procesu v ladicím programu Blazor WebAssembly (blazorwasm), který určuje cestu ke spustitelnému souboru, který se má spustit. Ve většině případů je „.NET: Spustit projekt jazyka C#“ fragment kódu lepší volbou, ale tento fragment kódu lze použít k úplné kontrole nad všemi možnostmi spuštění. Tento fragment kódu je pro hostované projekty Blazor, což je projekt, který má back-endovou aplikaci ASP.NET Core pro obsluhu svých souborů.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Tento fragment kódu slouží ke spuštění nového procesu v ladicím programu Blazor WebAssembly (blazorwasm). Ve většině případů je „.NET: Spustit projekt jazyka C#“ fragment kódu lepší volbou, ale tento fragment kódu lze použít k úplné kontrole nad všemi možnostmi spuštění. Tento fragment kódu je pro samostatné projekty Blazor, což je projekt, který nemá back-endovou aplikaci ASP.NET Core pro obsluhu svých souborů.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Tento fragment kódu slouží ke spuštění nového procesu v ladicím programu .NET (coreclr) a určuje cestu ke spustitelnému souboru, který se má spustit. Ve většině případů je „.NET: Spustit projekt jazyka C#“ “ fragment kódu lepší volbou. Tento fragment kódu je užitečný, když byl projekt sestaven mimo tuto instanci VS Code nebo když chcete hostovat kód .NET ve vlastním spustitelném souboru, například konkrétní verzi dotnet.exe/dotnet nebo pokud je kód .NET hostovaný nativní aplikací. Tento fragment kódu je pro konzolové aplikace.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Tento fragment kódu ukazuje, jak vzdáleně ladit kód .NET **bez** vzdálené komunikace VS Code. Měl by se používat v případech, kdy chcete projekt sestavit místně, ale spustit ho na jiném počítači.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Tento fragment kódu slouží ke spuštění nového procesu v ladicím programu .NET (coreclr) a určuje cestu ke spustitelnému souboru, který se má spustit. Ve většině případů je „.NET: Spustit projekt jazyka C#“ “ fragment kódu lepší volbou. Tento fragment kódu je užitečný, když byl projekt sestaven mimo tuto instanci VS Code nebo když chcete hostovat kód .NET ve vlastním spustitelném souboru, například konkrétní verzi dotnet.exe/dotnet nebo pokud je kód .NET hostovaný nativní aplikací. Tento fragment kódu je pro webové aplikace (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Připojení k procesu .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Vzdálené ladění – připojení k procesu .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Webové sestavení – spuštění hostovaného projektu Blazor",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Webové sestavení – spuštění samostatného projektu Blazor",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Spustit spustitelný soubor (konzola)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Vzdálené ladění – spustitelný soubor (konzola)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Spustit spustitelný soubor (web)",
+  "debuggers.dotnet.configurationSnippets.description": "Tento fragment kódu konfiguruje VS Code pro ladění projektu jazyka C#. Možnosti ladění (příklad: argumenty spustitelného souboru) se dají nakonfigurovat prostřednictvím souboru „<project-directory>/Properties/launchSettings.json“.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Spustit projekt C#",
   "debuggers.dotnet.launch.launchConfigurationId.description": "ID konfigurace spuštění, které se má použít. Pokud je řetězec prázdný, použije se aktuální aktivní konfigurace.",
   "debuggers.dotnet.launch.projectPath.description": "Cesta k souboru .csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "Při hodnotě true (výchozí stav) se ladicí program pokusí o rychlejší vyhodnocení tím, že provede simulaci provádění jednoduchých vlastností a metod.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Pokud je tato hodnota zadaná, označuje název profilu v souboru launchSettings.json, který se má použít. Ignoruje se, pokud se soubor launchSettings.json nenajde. Soubor launchSettings.json se bude číst ze zadané cesty, která by měla být vlastností launchSettingsFilePath, nebo {cwd}/Properties/launchSettings.json, pokud není nastavená. Pokud je tato hodnota nastavená na null nebo prázdný řetězec, soubor launchSettings.json se ignoruje. Pokud tato hodnota není zadaná, použije se první profil Project.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Příznak určující, jestli se má text stdout ze spuštění webového prohlížeče protokolovat do okna výstupu. Výchozí hodnota této možnosti je true.",
   "generateOptionsSchema.logging.description": "Příznaky určující, jaké typy zpráv se mají protokolovat do okna výstupu.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Pokud je hodnota true, protokolování modulu bude obsahovat vlastnosti adapterElapsedTime a engineElapsedTime, které označují dobu v mikrosekundách, po kterou požadavek trval. Výchozí hodnota této možnosti je false.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Příznak, který určuje, jestli se protokoly diagnostického stroje mají protokolovat do okna výstupu. Výchozí hodnota této možnosti je false.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Vytisknout všechna volání rozhraní API ladicího programu. Toto je velmi podrobné.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Selhání tisku z volání rozhraní API ladicího programu.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Určuje, jestli se má do výstupního okna vytisknout volání rozhraní API do Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h. Výchozí hodnota této možnosti se vrací na „none“.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Zakázat trasování volání rozhraní API",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Označit příznakem určujícím, zda má být povoleno podrobné trasování událostí vyvolaných základním modulem runtime. Výchozí hodnota této možnosti se vrací na „false“.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Nastavení řídící to, které zprávy se vytisknou do okna výstupu z diagnostického protokolu ladicího programu. Účelem tohoto protokolu je pomoci při řešení problémů s ladicím programem.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Umožňuje vytisknout diagnostické zprávy na úrovni chyb.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Vytisknout důležité diagnostické zprávy.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Určuje, které zprávy se vytisknou do okna výstupu z dispečera ladicího programu. Pokud se nezadá, použije se výchozí hodnota none, pokud není povolené jedno z podrobných nastavení protokolu („debugEngineAPITracing“, „debugRuntimeEventTracing“, „expressionEvaluationTracing“ nebo „startDebuggingTracing“), v takovém případě se výchozí hodnota změní na „normal“.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Netisknout další diagnostické zprávy.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Vytisknout všechny nepodrobné diagnostické zprávy.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Příznak určující, zda má být povoleno podrobné trasování pro vyhodnocení výrazu. Výchozí hodnota této možnosti se vrací na „false“.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Označit příznakem určujícím, jestli se mají zprávy protokolu DAP vyměňované mezi ladicím programem jazyka C# a uživatelským rozhraním protokolovat do okna výstupu. Výchozí hodnota této možnosti se vrací na „false“.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Příznak určující, jestli se má povolit podrobné trasování pro spuštění ladění. Výchozí hodnota této možnosti se vrací na „false“.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Pokud je hodnota true, protokolování zpráv protokolu bude obsahovat vlastnosti „adapterElapsedTime“ a „engineElapsedTime“, které označují dobu v mikrosekundách, po kterou požadavek trval. Výchozí hodnota této možnosti se vrací na „false“.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "Nastavení „logging.engineLogging“ je zastaralé a místo toho se použije „logging.diagnosticsLog.protocolMessages“.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Příznak určující, jestli se do okna výstupu mají protokolovat zprávy výjimek. Výchozí hodnota této možnosti je true.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Příznak určující, jestli se do okna výstupu mají protokolovat události načtení modulu. Výchozí hodnota této možnosti je true.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Určuje, jestli se při ukončení cílového procesu nebo zastavení ladění zaprotokoluje zpráva. Výchozí hodnota této možnosti je true.",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "Nepokoušejte se načíst symboly pro ŽÁDNÝ modul, pokud není v poli „includedModules“, nebo je součástí nastavení „includeSymbolsNextToModules“.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Pokud je hodnota true, přidá se do cesty pro hledání symbolů server symbolů pro produkty Microsoft (https​://msdl.microsoft.com​/download/symbols). Pokud tato možnost není zadaná, výchozí hodnota je false.",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Pokud je hodnota true, přidá se do cesty pro hledání symbolů server symbolů pro NuGet.org (https​://symbols.nuget.org​/download/symbols). Pokud tato možnost není zadaná, výchozí hodnota je false.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Pole adres URL serveru symbolů (například: http​://MyExampleSymbolServer) nebo adresářů (například: /build/symbols) k vyhledávání souborů .pdb. Tyto adresáře budou prohledány kromě výchozích umístění – vedle modulu a cesty, kam byl soubor pdb původně přemístěn.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Pole adres URL serveru symbolů (například: http​://MyExampleSymbolServer) nebo adresářů (příklad: /build/symbols) k vyhledávání souborů .pdb. Tyto adresáře budou prohledány spolu s výchozími umístěními – vedle modulu a cesty, kam byl soubor pdb původně přemístěn.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Podporováno pouze v místním ladění macOS]\r\n\r\nArchitektura laděného procesu. Tato chyba se automaticky zjistí, pokud není tento parametr nastavený. Povolené hodnoty jsou x86_64 nebo arm64.",
   "generateOptionsSchema.targetOutputLogPath.description": "Při nastavení této možnosti se text, který cílová aplikace zapisuje do stdout a stderr (např. Console.WriteLine), uloží do zadaného souboru. Tato možnost se bude ignorovat, pokud je konzola nastavená na jinou hodnotu než internalConsole. Příklad: ${workspaceFolder}/out.txt",
   "viewsWelcome.debug.contents": "[Generování prostředků jazyka C# pro sestavení a ladění](command:dotnet.generateAssets)\r\n\r\nDalší informace o souboru launch.json najdete v tématu [Konfigurace souboru launch.json pro ladění v jazyce C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.de.json b/package.nls.de.json
index 4c409e3ed..6e358abef 100644
--- a/package.nls.de.json
+++ b/package.nls.de.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "An einen .NET 5+ oder .NET Core-Prozess anfügen",
+  "command.csharp.downloadDebugger": ".NET Core-Debugger herunterladen",
+  "command.csharp.listProcess": "Prozess zum Anfügen auflisten",
+  "command.csharp.listRemoteDockerProcess": "Prozesse für Docker-Verbindung auflisten",
+  "command.csharp.listRemoteProcess": "Prozesse für Remoteverbindung zum Anfügen auflisten",
+  "command.csharp.reportIssue": "Ein Problem melden",
+  "command.csharp.showDecompilationTerms": "Vereinbarung zu den Decompilerbedingungen anzeigen",
+  "command.dotnet.generateAssets.currentProject": "Ressourcen für Build und Debuggen generieren",
+  "command.dotnet.openSolution": "Projektmappe öffnen",
+  "command.dotnet.restartServer": "Sprachserver neu starten",
+  "command.dotnet.restore.all": "Alle Projekte wiederherstellen",
+  "command.dotnet.restore.project": "Projekt wiederherstellen",
+  "command.dotnet.test.debugTestsInContext": "Tests im Kontext debuggen",
+  "command.dotnet.test.runTestsInContext": "Tests im Kontext ausführen",
+  "command.extension.showRazorCSharpWindow": "Razor CSharp anzeigen",
+  "command.extension.showRazorHtmlWindow": "Razor-HTML anzeigen",
+  "command.o.fixAll.document": "Alle Vorkommen eines Codeproblems innerhalb des Dokuments beheben",
+  "command.o.fixAll.project": "Alle Vorkommen eines Codeproblems innerhalb des Projekts beheben",
+  "command.o.fixAll.solution": "Alle Vorkommen eines Codeproblems innerhalb der Projektmappe beheben",
+  "command.o.pickProjectAndStart": "Projekt auswählen",
+  "command.o.reanalyze.allProjects": "Alle Projekte analysieren",
+  "command.o.reanalyze.currentProject": "Aktuelles Projekt analysieren",
+  "command.o.restart": "OmniSharp neu starten",
+  "command.razor.reportIssue": "Razor-Problem melden",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Hinweise für die implizite Objekterstellung anzeigen",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Hinweise für Variablen mit abgeleiteten Typen anzeigen",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Hinweise für Indexer anzeigen",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Hinweise für Lambda-Parametertypen anzeigen",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Inlinetyphinweise anzeigen",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Ausführen der Hintergrundcodeanalyse für:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Ausführen der Hintergrundcodeanalyse für: (Zuvor \"omnisharp.enableRoslynAnalyzers\")",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Gesamte Projektmappe",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Keine",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Geöffnete Dokumente",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Gesamte Projektmappe",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Keine",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Geöffnete Dokumente",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Gibt an, ob die Verweise auf CodeLens angezeigt werden sollen.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Gibt an, ob der CodeLens-Test zum Ausführen und Debuggen angezeigt werden soll.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Gibt an, ob die Verweise auf CodeLens angezeigt werden sollen. (Zuvor \"csharp.referencesCodeLens.enabled\")",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Gibt an, ob der CodeLens-Test zum Ausführen und Debuggen angezeigt werden soll. (Zuvor \"csharp.testsCodeLens.enabled\")",
   "configuration.dotnet.completion.provideRegexCompletions": "Reguläre Ausdrücke in der Vervollständigungsliste anzeigen.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Ermöglicht die Anzeige nicht importierter Typen und nicht importierter Erweiterungsmethoden in Vervollständigungslisten. Wenn ein Commit ausgeführt wird, wird die entsprechende using-Direktive am Anfang der aktuellen Datei hinzugefügt.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Ermöglicht die Anzeige nicht importierter Typen und nicht importierter Erweiterungsmethoden in Vervollständigungslisten. Wenn ein Commit ausgeführt wird, wird die entsprechende using-Direktive am Anfang der aktuellen Datei hinzugefügt. (Zuvor \"omnisharp.enableImportCompletion\")",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Führen Sie die automatische Vervollständigung des Objektnamens für die Elemente aus, die Sie kürzlich ausgewählt haben.",
-  "configuration.dotnet.defaultSolution.description": "Der Pfad der Standardlösung, die im Arbeitsbereich geöffnet werden soll, oder auf \"deaktivieren\" festlegen, um sie zu überspringen.",
+  "configuration.dotnet.defaultSolution.description": "Der Pfad der Standardlösung, die im Arbeitsbereich geöffnet werden soll, oder auf \"deaktivieren\" festlegen, um sie zu überspringen. (Zuvor \"omnisharp.defaultLaunchSolution\")",
   "configuration.dotnet.dotnetPath": "Gibt den Pfad zu einem dotnet-Installationsverzeichnis an, das anstelle des Standardsystems verwendet werden soll. Dies wirkt sich nur auf die dotnet-Installation aus, die zum Hosten des Sprachservers selbst verwendet werden soll. Beispiel: \"/home/username/mycustomdotnetdirectory\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zugehörige JSON-Komponenten unter dem Cursor markieren.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zugehörige Komponenten regulärer Ausdrücke unter dem Cursor markieren.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Hinweise unterdrücken, wenn das Argument mit dem Namen des Parameters übereinstimmt",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Hinweise unterdrücken, wenn der Parametername mit der Methodenabsicht übereinstimmt",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Aktivieren der Navigation zu dekompilierten Quellen.",
+  "configuration.dotnet.preferCSharpExtension": "Erzwingt, dass Projekte nur mit der C#-Erweiterung geladen werden.  Dies kann nützlich sein, wenn Legacy-Projekttypen verwendet werden, die vom C# Dev Kit nicht unterstützt werden. (Erfordert erneutes Laden des Fensters)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Beschreibungsinformationen beim Anzeigen des Symbols anzeigen.",
+  "configuration.dotnet.server.crashDumpPath": "Legt einen Ordnerpfad fest, in den Absturzabbilder geschrieben werden, wenn der Sprachserver abstürzt.  Muss vom Benutzer beschreibbar sein.",
   "configuration.dotnet.server.extensionPaths": "Außerkraftsetzung für Pfad zu Sprachserver --extension-Argumenten",
-  "configuration.dotnet.server.path": "Gibt den absoluten Pfad zur ausführbaren Serverdatei (LSP oder O#) an. Wenn sie leer gelassen wird, wird die an die C#-Erweiterung angeheftete Version verwendet.",
+  "configuration.dotnet.server.path": "Gibt den absoluten Pfad zur ausführbaren Serverdatei (LSP oder O#) an. Wenn sie leer gelassen wird, wird die an die C#-Erweiterung angeheftete Version verwendet. (Zuvor \"omnisharp.path\")",
+  "configuration.dotnet.server.startTimeout": "Gibt ein Timeout (in ms) an, mit dem der Client erfolgreich gestartet und eine Verbindung mit dem Sprachserver hergestellt werden kann.",
   "configuration.dotnet.server.trace": "Legt den Protokolliergrad für den Sprachserver fest.",
-  "configuration.dotnet.server.waitForDebugger": "Übergibt das Flag \"--debug\" beim Starten des Servers, damit ein Debugger angefügt werden kann.",
+  "configuration.dotnet.server.waitForDebugger": "Übergibt das Flag \"--debug\" beim Starten des Servers, damit ein Debugger angefügt werden kann. (Zuvor \"omnisharp.waitForDebugger\")",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Symbole in Verweisassemblys suchen. Dies wirkt sich auf Features aus, die eine Symbolsuche erfordern, z. B. Importe hinzufügen.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Optionen, die mit dem Debugger beim Starten des Komponententestdebuggings verwendet werden können.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Optionen, die mit dem Debugger beim Starten des Komponententestdebuggings verwendet werden können. (Zuvor \"csharp.unitTestDebuggingOptions\")",
   "configuration.razor.languageServer.debug": "Gibt an, ob beim Starten des Sprachservers auf die Debuganfügung gewartet werden soll.",
   "configuration.razor.languageServer.directory": "Überschreibt den Pfad zum Razor-Sprachserver-Verzeichnis.",
   "configuration.razor.trace": "Gibt an, ob alle Nachrichten [Verbose], einige Nachrichten [Messages] oder gar nicht [Off] ausgegeben werden sollen.",
   "configuration.razor.trace.messages": "Protokolliert nur einige Nachrichten von der Razor-Erweiterung.",
   "configuration.razor.trace.off": "Protokolliert keine Nachrichten von der Razor-Erweiterung.",
   "configuration.razor.trace.verbose": "Protokolliert alle Nachrichten aus der Razor-Erweiterung.",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Fügen Sie den .NET-Debugger (coreclr) an einen laufenden Prozess an. Dies kann auch mit dem Befehl \"An einen .NET 5+- oder .NET Core-Prozess anfügen\" erfolgen.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Dieser Codeschnipsel wird verwendet, um einen neuen Prozess unter dem Blazor WebAssembly-Debugger (blazorwasm) zu starten. Dabei wird der Pfad zu der ausführbaren Datei angegeben, die gestartet werden soll. In den meisten Fällen ist der Codeschnipsel \".NET: C#-Projekt starten\" die bessere Wahl. Dieser Codeschnipsel kann jedoch verwendet werden, um Vollzugriff auf alle Startoptionen zu erhalten. Dieser Codeschnipsel ist für gehostete Blazor-Projekte vorgesehen. Dabei handelt es sich um ein Projekt, das im Back-End über eine ASP.NET Core-App zum Verarbeiten der Dateien verfügt.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Dieser Codeschnipsel wird verwendet, um einen neuen Prozess unter dem Blazor WebAssembly-Debugger (blazorwasm) zu starten. In den meisten Fällen ist der Codeschnipsel \".NET: C#-Projekt starten\" die bessere Wahl. Dieser Codeschnipsel kann jedoch verwendet werden, um Vollzugriff auf alle Startoptionen zu erhalten. Dieser Codeschnipsel ist für eigenständige Blazor-Projekte vorgesehen. Dabei handelt es sich um ein Projekt, das im Back-End über keine ASP.NET Core-App zum Verarbeiten der Dateien verfügt.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Dieser Codeschnipsel wird verwendet, um einen neuen Prozess unter dem .NET-Debugger (coreclr) zu starten. Dabei wird der Pfad zu der ausführbaren Datei angegeben, die gestartet werden soll. In den meisten Fällen ist der Codeschnipsel \".NET: C#-Projekt starten\" die bessere Wahl. Dieser Codeschnipsel ist nützlich, wenn das Projekt außerhalb dieser VS Code-Instanz erstellt wurde, wenn Sie Ihren .NET-Code in einer benutzerdefinierten ausführbaren Datei (z. B. in einer bestimmten Version von \"dotnet.exe\"/\"dotnet\") hosten möchten oder wenn der .NET-Code von einer nativen Anwendung gehostet wird. Dieser Codeschnipsel ist für Konsolenanwendungen vorgesehen.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Dieser Codeschnipsel zeigt, wie Sie ein Remotedebuggen von .NET Code **ohne** die Remotefunktion von VS Code durchführen. Dies sollte in Fällen verwendet werden, in denen Sie Ihr Projekt lokal erstellen, aber auf einem anderen Computer ausführen möchten.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Dieser Codeschnipsel wird verwendet, um einen neuen Prozess unter dem .NET-Debugger (coreclr) zu starten. Dabei wird der Pfad zu der ausführbaren Datei angegeben, die gestartet werden soll. In den meisten Fällen ist der Codeschnipsel \".NET: C#-Projekt starten\" die bessere Wahl. Dieser Codeschnipsel ist nützlich, wenn das Projekt außerhalb dieser VS Code-Instanz erstellt wurde, wenn Sie Ihren .NET-Code in einer benutzerdefinierten ausführbaren Datei (z. B. in einer bestimmten Version von \"dotnet.exe\"/\"dotnet\") hosten möchten oder wenn der .NET-Code von einer nativen Anwendung gehostet wird. Dieser Codeschnipsel ist für Webanwendungen (ASP.NET Core) geeignet.",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: An einen .NET-Prozess anfügen",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Remotedebuggen – An .NET-Prozess anfügen",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Webassembly – Gehostetes Blazor-Projekt starten",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Webassembly – Eigenständiges Blazor-Projekt starten",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Ausführbare Datei starten (Konsole)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Remotedebuggen – Ausführbare Datei starten (Konsole)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Ausführbare Datei starten (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Dieser Codeschnipsel konfiguriert VS Code für das Debuggen eines C#-Projekts. Debugoptionen (zum Beispiel Argumente für die ausführbare Datei) können über die Datei '<project-directory>/Properties/launchSettings.json' konfiguriert werden.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: C#-Projekt starten",
   "debuggers.dotnet.launch.launchConfigurationId.description": "Die zu verwendende Startkonfigurations-ID. Eine leere Zeichenfolge verwendet die aktuelle aktive Konfiguration.",
   "debuggers.dotnet.launch.projectPath.description": "Pfad zur CSPROJ-Datei.",
   "generateOptionsSchema.allowFastEvaluate.description": "Bei \"true\" (Standardzustand) versucht der Debugger eine schnellere Auswertung, indem er die Ausführung einfacher Eigenschaften und Methoden simuliert.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Gibt bei Angabe den Namen des Profils in \"launchSettings.json\" an, das verwendet werden soll. Dies wird ignoriert, wenn launchSettings.json nicht gefunden wird. \"launchSettings.json\" wird aus dem angegebenen Pfad gelesen. Dabei muss es sich um die Eigenschaft \"launchSettingsFilePath\" oder um {cwd}/Properties/launchSettings.json handeln, wenn dies nicht festgelegt ist. Wenn dieser Wert auf NULL oder eine leere Zeichenfolge festgelegt ist, wird launchSettings.json ignoriert. Wenn dieser Wert nicht angegeben ist, wird das erste Projekt-Profil verwendet.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Kennzeichnung, um zu bestimmen, ob stdout-Text vom Start des Webbrowsers im Ausgabefenster protokolliert werden soll. Diese Option wird standardmäßig auf \"true\" festgelegt.",
   "generateOptionsSchema.logging.description": "Kennzeichnungen, um zu bestimmen, welche Nachrichtentypen im Ausgabefenster protokolliert werden sollen.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Bei \"True\" beinhaltet die Engine-Protokollierung die Eigenschaften \"adapterElapsedTime\" und \"engineElapsedTime\", um anzugeben, wie lange eine Anforderung in Mikrosekunden gedauert hat. Diese Option ist standardmäßig auf \"false\" festgelegt.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Kennzeichnung, um zu bestimmen, ob Protokolle der Diagnose-Engine im Ausgabefenster protokolliert werden sollen. Diese Option ist standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Hiermit werden alle Debugger-API-Aufrufe ausgegeben. Diese Option ist sehr ausführlich.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Hiermit werden Fehler aus Debugger-API-Aufrufen ausgegeben.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Steuert, ob API-Aufrufe an \"Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h\" im Ausgabefenster ausgegeben werden sollen. Diese Option ist standardmäßig auf \"none\" festgelegt.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Ablaufverfolgung für API-Aufrufe deaktivieren",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Flag, mit dem festgelegt wird, ob die ausführliche Ablaufverfolgung für Ereignisse aktiviert werden soll, die von der zugrunde liegenden Runtime ausgelöst werden. Diese Option ist standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Einstellungen, mit denen festgelegt wird, welche Meldungen aus dem Diagnoseprotokoll des Debuggers im Ausgabefenster ausgegeben werden. Dieses Protokoll dient zur Unterstützung bei der Behandlung von Problemen mit dem Debugger.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Hiermit werden Diagnosemeldungen auf Fehlerebene ausgegeben.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Hiermit werden wichtige Diagnosemeldungen ausgegeben.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Steuert, welche Meldungen vom Dispatcher des Debuggers im Ausgabefenster ausgegeben werden. Sofern nicht angegeben, wird standardmäßig \"none\" verwendet – es sei denn, eine der ausführlichen Protokolleinstellungen ist aktiviert (\"debugEngineAPITracing\", \"debugRuntimeEventTracing\", \"expressionEvaluationTracing\" oder \"startDebuggingTracing\"). In diesem Fall wird der Standardwert in \"normal\" geändert.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Hiermit werden keine zusätzlichen Diagnosemeldungen ausgegeben.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Hiermit werden alle nicht ausführlichen Diagnosemeldungen ausgegeben.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Flag, mit dem festgelegt wird, ob die ausführliche Ablaufverfolgung für die Ausdrucksauswertung aktiviert werden soll. Diese Option ist standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Flag, mit dem festgelegt wird, ob die zwischen dem C#-Debugger und der Benutzeroberfläche ausgetauschten DAP-Protokollnachrichten im Ausgabefenster protokolliert werden sollen. Diese Option ist standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Flag zur Festlegung, ob die ausführliche Ablaufverfolgung beim Starten des Debuggens aktiviert werden soll. Diese Option ist standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Bei einer Festlegung auf \"true\" umfasst die Nachrichtenprotokollierung die Eigenschaften \"adapterElapsedTime\" und \"engineElapsedTime\", um die Zeitspanne in Mikrosekunden anzugeben, die für eine Anforderung benötigt wurde. Diese Option ist standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "Die Einstellung \"logging.engineLogging\" wurde zugunsten von \"logging.diagnosticsLog.protocolMessages\" als veraltet eingestuft.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Kennzeichnung, um zu bestimmen, ob Ausnahmemeldungen im Ausgabefenster protokolliert werden sollen. Diese Option wird standardmäßig auf \"true\" festgelegt.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Kennzeichnung, um zu bestimmen, ob Modulladeereignisse im Ausgabefenster protokolliert werden sollen. Diese Option wird standardmäßig auf \"true\" festgelegt.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Steuert, ob eine Nachricht protokolliert wird, wenn der Zielprozess beendet oder das Debuggen beendet wird. Diese Option wird standardmäßig auf \"true\" festgelegt.",
@@ -137,8 +193,8 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Laden Sie Symbole für alle Module, es sei denn, das Modul befindet sich im Array „excludedModules“.",
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "Versuchen Sie nicht, Symbole für IRGENDEIN Modul zu laden, es sei denn, es befindet sich im Array „includedModules“, oder es wird über die Einstellung „includeSymbolsNextToModules“ hinzugefügt.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Wenn „true“, wird der Microsoft-Symbolserver (https​://msdl.microsoft.com​/download/symbols) dem Symbolsuchpfad hinzugefügt. Wenn nicht angegeben, wird diese Option standardmäßig auf „false“ eingestellt.",
-  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Bei \"true\" wird der NuGet.org-Symbolserver (https://symbols.nuget.org/download/symbols) dem Symbolsuchpfad hinzugefügt. Wenn keine Angabe erfolgt, wird diese Option standardmäßig auf \"false\" festgelegt.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Ein Array von Symbolserver-URLs (Beispiel: http​://MyExampleSymbolServer) oder Verzeichnisse (Beispiel:/Build/Symbols) für die Suche nach PDB-Dateien. Diese Verzeichnisse werden zusätzlich zu den Standardspeicherorten durchsucht – neben dem Modul und dem Pfad, in dem die PDB ursprünglich abgelegt wurde.",
+  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Bei \"true\" wird der NuGet.org-Symbolserver (https​://symbols.nuget.org​/download/symbols) dem Symbolsuchpfad hinzugefügt. Wenn keine Angabe erfolgt, wird diese Option standardmäßig auf \"false\" festgelegt.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Array von Symbolserver-URLs (example: http​://MyExampleSymbolServer) oder Verzeichnisse (example: /build/symbols), um nach PDB-Dateien zu suchen. Diese Verzeichnisse werden zusätzlich zu den Standardspeicherorten durchsucht – neben dem Modul und dem Pfad, in dem die PDB-Datei ursprünglich abgelegt wurde.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Nur beim lokalen macOS-Debuggen unterstützt]\r\n\r\nDie Architektur des Debuggens. Dies wird automatisch erkannt, es sei denn, dieser Parameter ist festgelegt. Zulässige Werte sind \"x86_64\" oder \"arm64\".",
   "generateOptionsSchema.targetOutputLogPath.description": "Bei Festlegung wird Text, den die Zielanwendung in \"stdout\" und \"stderr\" (z. B. Console.WriteLine) schreibt, in der angegebenen Datei gespeichert. Diese Option wird ignoriert, wenn die Konsole auf einen anderen Wert als internalConsole festgelegt ist. Beispiel: \"${workspaceFolder}/out.txt\"",
   "viewsWelcome.debug.contents": "[C#-Objekte für Build und Debuggen generieren](command:dotnet.generateAssets)\r\n\r\nWeitere Informationen zu launch.json finden Sie unter [Konfigurieren von launch.json für das C#-Debuggen](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.es.json b/package.nls.es.json
index e27173514..779c7817a 100644
--- a/package.nls.es.json
+++ b/package.nls.es.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Adjuntar a un proceso de .NET 5 (o posterior) o .NET Core",
+  "command.csharp.downloadDebugger": "Descargar depurador de .NET Core",
+  "command.csharp.listProcess": "Enumerar proceso que se va a adjuntar",
+  "command.csharp.listRemoteDockerProcess": "Enumerar procesos en conexión de Docker",
+  "command.csharp.listRemoteProcess": "Enumerar procesos en conexión remota para adjuntar",
+  "command.csharp.reportIssue": "Informar de un problema",
+  "command.csharp.showDecompilationTerms": "Mostrar el contrato de términos del descompilador",
+  "command.dotnet.generateAssets.currentProject": "Generar recursos para compilar y depurar",
+  "command.dotnet.openSolution": "Abrir solución",
+  "command.dotnet.restartServer": "Reiniciar servidor de lenguaje",
+  "command.dotnet.restore.all": "Restaurar todos los proyectos",
+  "command.dotnet.restore.project": "Restaurar proyecto",
+  "command.dotnet.test.debugTestsInContext": "Depurar pruebas en contexto",
+  "command.dotnet.test.runTestsInContext": "Ejecutar pruebas en contexto",
+  "command.extension.showRazorCSharpWindow": "Mostrar CSharp de Razor",
+  "command.extension.showRazorHtmlWindow": "Mostrar HTML de Razor",
+  "command.o.fixAll.document": "Corregir todas las repeticiones de un problema de código en el documento",
+  "command.o.fixAll.project": "Corregir todas las repeticiones de un problema de código en el proyecto",
+  "command.o.fixAll.solution": "Corregir todas las repeticiones de un problema de código en la solución",
+  "command.o.pickProjectAndStart": "Seleccionar proyecto",
+  "command.o.reanalyze.allProjects": "Analizar todos los proyectos",
+  "command.o.reanalyze.currentProject": "Analizar proyecto actual",
+  "command.o.restart": "Reiniciar OmniSharp",
+  "command.razor.reportIssue": "Notificar un problema de Razor",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Mostrar sugerencias para la creación implícita de objetos",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Mostrar sugerencias para las variables con tipos inferidos",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Mostrar sugerencias para indizadores",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Mostrar sugerencias para los tipos de parámetros lambda",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Mostrar sugerencias de tipo insertado",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Ejecutar el análisis del código en segundo plano para:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Ejecutar análisis de código en segundo plano para: (anteriormente \"omnisharp.enableRoslynAnalyzers\")",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Toda la solución",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Ninguno",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Documentos abiertos",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Toda la solución",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Ninguno",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Documentos abiertos",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Especifica si se deben mostrar las referencias a CodeLens.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Especifica si se debe mostrar CodeLens de prueba de ejecución y depuración.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Especifica si se deben mostrar las referencias CodeLens. (Anteriormente \"csharp.referencesCodeLens.enabled\")",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Especifica si se debe mostrar CodeLens de prueba de ejecución y depuración. (Anteriormente \"csharp.testsCodeLens.enabled\")",
   "configuration.dotnet.completion.provideRegexCompletions": "Mostrar expresiones regulares en la lista de finalización.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Habilita la compatibilidad para mostrar tipos no importados y métodos de extensión no importados en listas de finalización. Cuando se confirme, la directiva de uso adecuada se agregará en la parte superior del archivo actual.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Habilita la compatibilidad para mostrar tipos no importados y métodos de extensión no importados en listas de finalización. Cuando se confirme, se agregará la directiva de uso adecuada en la parte superior del archivo actual. (Anteriormente \"omnisharp.enableImportCompletion\")",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Realice la finalización automática del nombre de objeto para los miembros que ha seleccionado recientemente.",
-  "configuration.dotnet.defaultSolution.description": "Ruta de acceso de la solución predeterminada que se va a abrir en el área de trabajo o que se establece en \"deshabilitar\" para omitirla.",
+  "configuration.dotnet.defaultSolution.description": "Ruta de acceso de la solución predeterminada que se va a abrir en el área de trabajo o se establece en \"deshabilitar\" para omitirla. (Anteriormente \"omnisharp.defaultLaunchSolution\")",
   "configuration.dotnet.dotnetPath": "Especifica la ruta de acceso a un directorio de instalación de dotnet que se va a usar en lugar del predeterminado del sistema. Esto solo influye en la instalación de dotnet que se va a usar para hospedar el propio servidor de idioma. Ejemplo: \"/home/username/mycustomdotnetdirectory\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Resaltar los componentes JSON relacionados bajo el cursor.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Resaltar los componentes de expresiones regulares relacionados bajo el cursor.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Suprimir las sugerencias cuando el argumento coincide con el nombre del parámetro",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Suprimir las sugerencias cuando el nombre del parámetro coincida con la intención del método",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Habilitar la navegación a fuentes descompiladas.",
+  "configuration.dotnet.preferCSharpExtension": "Fuerza la carga de proyectos solo con la extensión de C#.  Esto puede ser útil cuando se usan tipos de proyecto heredados que no son compatibles con el kit de desarrollo de C#. (Requiere volver a cargar la ventana)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostrar información de comentarios cuando se muestra el símbolo.",
+  "configuration.dotnet.server.crashDumpPath": "Establece una ruta de acceso de carpeta en la que se escriben los volcados de memoria si el servidor de lenguaje se bloquea.  El usuario debe poder escribir en él.",
   "configuration.dotnet.server.extensionPaths": "Invalidación de la ruta de acceso a los argumentos --extension del servidor de lenguaje",
-  "configuration.dotnet.server.path": "Especifica la ruta de acceso absoluta al ejecutable del servidor (LSP o O#). Cuando se deja vacía, se usa la versión anclada a la extensión de C#.",
+  "configuration.dotnet.server.path": "Especifica la ruta absoluta al ejecutable del servidor (LSP u O#). Cuando se deja vacío, se utiliza la versión anclada a la extensión C#. (Anteriormente \"omnisharp.path\")",
+  "configuration.dotnet.server.startTimeout": "Especifica un tiempo de espera (en ms) para que el cliente se inicie correctamente y se conecte al servidor de lenguaje.",
   "configuration.dotnet.server.trace": "Establece el nivel de registro para el servidor de lenguaje",
-  "configuration.dotnet.server.waitForDebugger": "Pasa la marca --debug al iniciar el servidor para permitir que se adjunte un depurador.",
+  "configuration.dotnet.server.waitForDebugger": "Pasa la marca --debug al iniciar el servidor para permitir que se adjunte un depurador. (Anteriormente \"omnisharp.waitForDebugger\")",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Buscar símbolos en ensamblados de referencia. Afecta a las características y requiere la búsqueda de símbolos, como agregar importaciones.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Opciones que se van a usar con el depurador al iniciar para la depuración de pruebas unitarias.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Opciones que se van a usar con el depurador al iniciar para la depuración de pruebas unitarias. (Anteriormente \"csharp.unitTestDebuggingOptions\")",
   "configuration.razor.languageServer.debug": "Especifica si se debe esperar a que se adjunte la depuración al iniciar el servidor de lenguaje.",
   "configuration.razor.languageServer.directory": "Invalida la ruta de acceso al directorio del servidor de lenguaje Razor.",
   "configuration.razor.trace": "Especifica si se deben generar todos los mensajes [Verbose], algunos mensajes [Messages] o no [Off].",
   "configuration.razor.trace.messages": "Registra solo algunos mensajes de la extensión Razor.",
   "configuration.razor.trace.off": "No registra mensajes de la extensión Razor",
   "configuration.razor.trace.verbose": "Registra todos los mensajes de la extensión Razor.",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Adjunte el depurador de .NET (coreclr) a un proceso en ejecución. Esto también se puede hacer mediante el comando \"Asociar a un proceso de .NET 5+ o .NET Core\".",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Este fragmento de código se usa para iniciar un nuevo proceso en el depurador Blazor WebAssembly (blazorwasm), especificando la ruta de acceso al ejecutable que se va a iniciar. En la mayoría de los casos, \".NET: Launch C# project\" (Iniciar proyecto de C#) es una mejor opción, pero este fragmento de código se puede usar para tener control total sobre todas las opciones de inicio. Este fragmento de código es para proyectos de Blazor hospedados, que es un proyecto que tiene un back-end ASP.NET aplicación Core para atender sus archivos.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Este fragmento de código se usa para iniciar un nuevo proceso en el depurador WebAssembly de Blazor (blazorwasm). En la mayoría de los casos, \".NET: Launch C# project\" (Iniciar proyecto de C#) es una mejor opción, pero este fragmento de código se puede usar para tener control total sobre todas las opciones de inicio. Este fragmento de código es para proyectos independientes de Blazor, que es un proyecto que no tiene un back-end ASP.NET aplicación core para atender sus archivos.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Este fragmento de código se usa para iniciar un nuevo proceso en el depurador de .NET (coreclr), especificando la ruta de acceso al ejecutable que se va a iniciar. En la mayoría de los casos, \".NET: El fragmento de código \"Launch C# project\" (Iniciar proyecto de C#) es una mejor opción. Este fragmento de código es útil cuando el proyecto se compiló fuera de esta instancia de VS Code o si desea hospedar el código .NET en un archivo ejecutable personalizado, como una versión específica de \"dotnet.exe\"/\"dotnet\" o el código .NET se hospeda en una aplicación nativa. Este fragmento de código es para aplicaciones de consola.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Este fragmento de código muestra cómo depurar de forma remota .NET Code **sin** mediante VS Code comunicación remota. Debe usarse en los casos en los que desea compilar el proyecto localmente, pero ejecutarlo en otro equipo.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Este fragmento de código se usa para iniciar un nuevo proceso en el depurador de .NET (coreclr), especificando la ruta de acceso al ejecutable que se va a iniciar. En la mayoría de los casos, \".NET: El fragmento de código \"Launch C# project\" (Iniciar proyecto de C#) es una mejor opción. Este fragmento de código es útil cuando el proyecto se compiló fuera de esta instancia de VS Code o si desea hospedar el código .NET en un archivo ejecutable personalizado, como una versión específica de \"dotnet.exe\"/\"dotnet\" o el código .NET se hospeda en una aplicación nativa. Este fragmento de código es para aplicaciones web (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Asociación a un proceso de .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Depuración remota: Asociación a un proceso de .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Ensamblado web: Inicio del proyecto de Blazor hospedado",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Ensamblado web: Inicio de un proyecto de Blazor independiente",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Iniciar archivo ejecutable (consola)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Depuración remota: Iniciar archivo ejecutable (consola)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Iniciar archivo ejecutable (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Este fragmento de código configura VS Code para depurar un proyecto de C#. Las opciones de depuración (ejemplo: argumentos para el ejecutable) se pueden configurar a través del archivo \"<project-directory>/Properties/launchSettings.json\".",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Iniciar proyecto de C#",
   "debuggers.dotnet.launch.launchConfigurationId.description": "Identificador de configuración de inicio que se va a usar. La cadena vacía usará la configuración activa actual.",
   "debuggers.dotnet.launch.projectPath.description": "Ruta de acceso al archivo .csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "Cuando es true (el estado predeterminado), el depurador intentará una evaluación más rápida simulando la ejecución de propiedades y métodos simples.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Si se especifica, indica el nombre del perfil en launchSettings.json que se va a usar. Esto se omite si no se encuentra launchSettings.json. launchSettings.json se leerá desde la ruta de acceso especificada si se establece la propiedad \"launchSettingsFilePath\" o {cwd}/Properties/launchSettings.json si no está establecida. Si se establece en null o en una cadena vacía, se omite launchSettings.json. Si no se especifica este valor, se usará el primer perfil “Project”.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Marca para determinar si el texto stdout del inicio del explorador web debe registrarse en la ventana de salida. Esta opción tiene como valor predeterminado \"true\".",
   "generateOptionsSchema.logging.description": "Marcas para determinar qué tipos de mensajes se deben registrar en la ventana de salida.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Si es true, el registro del motor incluirá las propiedades \"adapterElapsedTime\" y \"engineElapsedTime\" para indicar la cantidad de tiempo, en microsegundos, que tardó una solicitud. El valor predeterminado de esta opción es \"false\".",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Marca para determinar si los registros del motor de diagnóstico se deben registrar en la ventana de salida. El valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Imprima todas las llamadas API del depurador. Esto es muy detallado.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Errores de impresión de llamadas API del depurador.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Controla si las llamadas API a Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h se deben imprimir en la ventana de salida. El valor predeterminado de esta opción es \"none\".",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Deshabilitar llamadas API de seguimiento",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Marca para determinar si debe habilitarse el seguimiento detallado de eventos generados por el tiempo de ejecución subyacente. El valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Configuración para controlar los mensajes que se imprimen en la ventana de salida desde el registro de diagnóstico del depurador. Este registro está diseñado para ayudar a solucionar problemas con el depurador.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Imprima mensajes de diagnóstico de nivel de error.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Imprima mensajes de diagnóstico importantes.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Controla los mensajes que se imprimen en la ventana de salida desde el Dispatcher del depurador. Si no se especifica, el valor predeterminado será \"none\" a menos que se habilite una de las opciones de registro detalladas (\"debugEngineAPITracing\", \"debugRuntimeEventTracing\", \"expressionEvaluationTracing\" o \"startDebuggingTracing\"), en cuyo caso el valor predeterminado cambia a \"normal\".",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "No imprimir mensajes de diagnóstico adicionales.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Imprima todos los mensajes de diagnóstico no detallados.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Marca para determinar si debe habilitarse el seguimiento detallado para la evaluación de expresiones. El valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Marca para determinar si los mensajes de protocolo DAP intercambiados entre el depurador de C# y la interfaz de usuario deben registrarse en la ventana de salida. El valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Marca para determinar si debe habilitarse el seguimiento detallado para iniciar la depuración. El valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Si es true, el registro del mensaje de protocolo incluirá las propiedades \"adapterElapsedTime\" y \"engineElapsedTime\" para indicar la cantidad de tiempo, en microsegundos, que tardó una solicitud. El valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "La configuración \"logging.engineLogging\" ha quedado en desuso en favor de \"logging.diagnosticsLog.protocolMessages\".",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Marca para determinar si los mensajes de excepción se deben registrar en la ventana de salida. Esta opción tiene como valor predeterminado \"true\".",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Marca para determinar si los eventos de carga del módulo se deben registrar en la ventana de salida. Esta opción tiene como valor predeterminado \"true\".",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Controla si se registra un mensaje cuando se cierra el proceso de destino o se detiene la depuración. Esta opción tiene como valor predeterminado \"true\".",
@@ -137,8 +193,8 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Cargar símbolos para todos los módulos a menos que el módulo esté en la matriz «excludedModules».",
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "No intente cargar los símbolos de NINGÚN módulo a menos que esté en la matriz «includedModules» o se incluya a través de la configuración «includeSymbolsNextToModules».",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Si es «verdadero», se agrega el servidor de símbolos de Microsoft (https​://msdl.microsoft.com​/download/symbols) a la ruta de búsqueda de símbolos. Si no se especifica, esta opción tendrá el valor predeterminado de «falso».",
-  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Si es \"true\", el servidor de símbolos de NuGet.org (https://symbols.nuget.org/download/symbols) se agrega a la ruta de acceso de búsqueda de símbolos. Si no se especifica, el valor predeterminado de esta opción es \"false\".",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Matriz de direcciones URL del servidor de símbolos (ejemplo: http​://MiServidordeSímblosdeEjemplo) o de directorios (ejemplo: /compilar/symbols) para buscar archivos. pdb. Se buscarán estos directorios además de las ubicaciones predeterminadas, junto al módulo y la ruta de acceso en la que se anuló originalmente el archivo pdb.",
+  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Si es \"true\", el servidor de símbolos de NuGet.org (https​://symbols.nuget.org​/download/symbols) se agrega a la ruta de acceso de búsqueda de símbolos. Si no se especifica, el valor predeterminado de esta opción es \"false\".",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Matriz de direcciones URL del servidor de símbolos (ejemplo: http​://MyExampleSymbolServer) o directorios (ejemplo: /build/symbols) para buscar archivos .pdb. Se buscarán estos directorios además de las ubicaciones predeterminadas, junto al módulo y la ruta de acceso en la que se anuló originalmente el archivo pdb.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Solo se admite en la depuración local de macOS]\r\n\r\nArquitectura del depurado. Esto se detectará automáticamente a menos que se establezca este parámetro. Los valores permitidos son \"x86_64\" o \"arm64\".",
   "generateOptionsSchema.targetOutputLogPath.description": "Cuando se establece, el texto que la aplicación de destino escribe en stdout y stderr (por ejemplo, Console.WriteLine) se guardará en el archivo especificado. Esta opción se omite si la consola se establece en un valor distinto de internalConsole. Por ejemplo, \"${workspaceFolder}/out.txt\"",
   "viewsWelcome.debug.contents": "[Generar recursos de C# para compilación y depuración](command:dotnet.generateAssets)\r\n\r\nPara obtener más información sobre launch.json, consulte [Configuración de launch.json para la depuración de C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.fr.json b/package.nls.fr.json
index 408e61f54..4ac3e4989 100644
--- a/package.nls.fr.json
+++ b/package.nls.fr.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Attacher à un processus .NET 5+ ou .NET Core",
+  "command.csharp.downloadDebugger": "Télécharger le débogueur .NET Core",
+  "command.csharp.listProcess": "Processus de liste pour la pièce jointe",
+  "command.csharp.listRemoteDockerProcess": "Répertorier les processus sur la connexion Docker",
+  "command.csharp.listRemoteProcess": "Répertorier les processus sur la connexion à distance pour la pièce jointe",
+  "command.csharp.reportIssue": "Signaler un problème",
+  "command.csharp.showDecompilationTerms": "Afficher l'accord sur les termes du décompilateur",
+  "command.dotnet.generateAssets.currentProject": "Générer des actifs pour la construction et le débogage",
+  "command.dotnet.openSolution": "Solution ouverte",
+  "command.dotnet.restartServer": "Redémarrer le serveur de langue",
+  "command.dotnet.restore.all": "Restaurer tous les projets",
+  "command.dotnet.restore.project": "Restaurer le projet",
+  "command.dotnet.test.debugTestsInContext": "Tests de débogage en contexte",
+  "command.dotnet.test.runTestsInContext": "Exécuter des tests en contexte",
+  "command.extension.showRazorCSharpWindow": "Afficher le rasoir CSharp",
+  "command.extension.showRazorHtmlWindow": "Afficher le code HTML du rasoir",
+  "command.o.fixAll.document": "Corriger toutes les occurrences d'un problème de code dans le document",
+  "command.o.fixAll.project": "Corriger toutes les occurrences d'un problème de code dans le projet",
+  "command.o.fixAll.solution": "Corriger toutes les occurrences d'un problème de code dans la solution",
+  "command.o.pickProjectAndStart": "Sélectionner un projet",
+  "command.o.reanalyze.allProjects": "Analyser tous les projets",
+  "command.o.reanalyze.currentProject": "Analyser le projet en cours",
+  "command.o.restart": "Redémarrez OmniSharp",
+  "command.razor.reportIssue": "Signaler un problème avec le rasoir",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Afficher les indicateurs pour la création d'objet implicite",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Afficher les indicateurs pour les variables ayant des types déduits",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Afficher les indicateurs pour les indexeurs",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Afficher les indicateurs pour les types de paramètre lambda",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Afficher les indicateurs de type inline",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Exécuter une analyse de code en arrière-plan pour :",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Exécuter l’analyse du code en arrière-plan pour : (précédemment, « omnisharp.enableRoslynAnalyzers »)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Solution complète",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Aucun",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Documents ouverts",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Solution complète",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Aucun",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Documents ouverts",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Spécifie si les références CodeLens doivent être affichées.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Spécifie si le codeLens de test d’exécution et de débogage doit être affiché.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Spécifie si les références CodeLens doivent être affichées. (Précédemment `csharp.referencesCodeLens.enabled`)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Spécifie si les tests d’exécution et de débogage CodeLens doivent être affichés. (Précédemment `csharp.testsCodeLens.enabled`)",
   "configuration.dotnet.completion.provideRegexCompletions": "Afficher les expressions régulières dans la liste de saisie semi-automatique.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Active la prise en charge de l’affichage des types non pris en charge et des méthodes d’extension non prises en charge dans les listes de saisie semi-automatique. Une fois validée, la directive using appropriée est ajoutée en haut du fichier actif.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Active la prise en charge de l’affichage des types non pris en charge et des méthodes d’extension non prises en charge dans les listes de saisie semi-automatique. Une fois validée, la directive using appropriée est ajoutée en haut du fichier actif. (Précédemment `omnisharp.enableImportCompletion`)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Effectuez la complétion automatique du nom d’objet pour les membres que vous avez récemment sélectionnés.",
-  "configuration.dotnet.defaultSolution.description": "Chemin de la solution par défaut à ouvrir dans l’espace de travail ou définir sur « désactiver » pour l’ignorer.",
+  "configuration.dotnet.defaultSolution.description": "Le chemin d’accès de la solution par défaut à ouvrir dans l’espace de travail, ou la valeur ’disable’ pour l’ignorer. (Précédemment `omnisharp.defaultLaunchSolution`)",
   "configuration.dotnet.dotnetPath": "Spécifie le chemin d’accès à un répertoire d’installation de dotnet à utiliser à la place du répertoire par défaut du système. Cela n’a d’influence que sur l’installation dotnet à utiliser pour héberger le serveur de langues lui-même. Exemple : \"/home/username/mycustomdotnetdirect\" : \"/home/nom d’utilisateur/monrépertoiredotnetpersonnalisé\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Mettez en surbrillance les composants JSON associés sous le curseur.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Mettre en surbrillance les composants d’expression régulière associés sous le curseur.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Supprimer les conseils lorsque l'argument correspond au nom du paramètre",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Supprimer les indicateurs quand le nom de paramètre correspond à l'intention de la méthode",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Activez la navigation vers les sources décompliées.",
+  "configuration.dotnet.preferCSharpExtension": "Force le chargement des projets avec l'extension C# uniquement.  Cela peut être utile lors de l’utilisation de types de projets hérités qui ne sont pas pris en charge par C# Dev Kit. (Nécessite le rechargement de la fenêtre)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Afficher les informations sur les remarques lors de l’affichage du symbole.",
+  "configuration.dotnet.server.crashDumpPath": "Définit un chemin de dossier dans lequel les vidages sur incident sont écrits en cas de panne du serveur de langue.  Doit être accessible en écriture par l'utilisateur.",
   "configuration.dotnet.server.extensionPaths": "Remplacer le chemin d’accès au serveur de langage --extension arguments",
-  "configuration.dotnet.server.path": "Spécifie le chemin absolu du fichier exécutable du serveur (LSP ou O#). Lorsqu’elle est laissée vide, la version épinglée à l’extension C# est utilisée.",
+  "configuration.dotnet.server.path": "Spécifie le chemin absolu du fichier exécutable du serveur (LSP ou O#). Lorsqu’elle est laissée vide, la version épinglée à l’extension C# est utilisée. (Précédemment `omnisharp.path`)",
+  "configuration.dotnet.server.startTimeout": "Spécifie un délai d'attente (en ms) pour que le client démarre et se connecte avec succès au serveur de langue.",
   "configuration.dotnet.server.trace": "Définit le niveau de journalisation pour le serveur de langage",
-  "configuration.dotnet.server.waitForDebugger": "Passe l’indicateur --debug au lancement du serveur pour permettre l’attachement d’un débogueur.",
+  "configuration.dotnet.server.waitForDebugger": "Passe le drapeau – debug lors du lancement du serveur pour permettre à un débogueur d’être attaché. (Précédemment `omnisharp.waitForDebugger`)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Rechercher des symboles dans les assemblys de référence. Elle affecte les fonctionnalités nécessitant une recherche de symboles, comme l’ajout d’importations.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Options à utiliser avec le débogueur lors du lancement pour le débogage de test unitaire.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Options à utiliser avec le débogueur lors du lancement du débogage des tests unitaires. (Précédemment `csharp.unitTestDebuggingOptions`)",
   "configuration.razor.languageServer.debug": "Spécifie s’il faut attendre l’attachement du débogage au lancement du serveur de langage.",
   "configuration.razor.languageServer.directory": "Remplace le chemin d’accès au répertoire du serveur de langage Razor.",
   "configuration.razor.trace": "Spécifie s’il faut générer tous les messages [Verbose], certains messages [Messages] ou pas du tout [Off].",
   "configuration.razor.trace.messages": "Journalise uniquement certains messages de l’extension Razor",
   "configuration.razor.trace.off": "Ne consigne pas les messages de l’extension Razor",
   "configuration.razor.trace.verbose": "Journalise tous les messages de l’extension Razor",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Attachez le débogueur .NET (coreclr) à un processus en cours d'exécution. Cela peut également être fait à l'aide de la commande « Attacher à un processus .NET 5+ ou .NET Core ».",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Cet extrait est utilisé pour lancer un nouveau processus sous le débogueur Blazor WebAssembly (blazorwasm), en spécifiant le chemin d'accès à l'exécutable à lancer. Dans la plupart des cas, le \".NET : L'extrait \"Lancer le projet C#\" est un meilleur choix, mais cet extrait peut être utilisé pour avoir un contrôle total sur toutes les options de lancement. Cet extrait est destiné aux projets Blazor hébergés, qui sont un projet doté d'une application backend ASP.NET Core pour servir ses fichiers.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Cet extrait est utilisé pour lancer un nouveau processus sous le débogueur Blazor WebAssembly (blazorwasm). Dans la plupart des cas, le \".NET : L'extrait \"Lancer le projet C#\" est un meilleur choix, mais cet extrait peut être utilisé pour avoir un contrôle total sur toutes les options de lancement. Cet extrait concerne les projets Blazor autonomes, qui ne disposent pas d'une application backend ASP.NET Core pour servir ses fichiers.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Cet extrait est utilisé pour lancer un nouveau processus sous le débogueur .NET (coreclr), en spécifiant le chemin d'accès à l'exécutable à lancer. Dans la plupart des cas, le \".NET : L'extrait \"Lancer le projet C#\" est un meilleur choix. Cet extrait est utile lorsque le projet a été créé en dehors de cette instance de VS Code ou que vous souhaitez héberger votre code .NET dans un exécutable personnalisé, tel qu'une version spécifique de 'dotnet.exe'/'dotnet' ou que le code .NET est hébergé. par une application native. Cet extrait est destiné aux applications console.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Cet extrait montre comment déboguer à distance le code .NET **sans** utiliser l'accès à distance VS Code. Il doit être utilisé dans les cas où vous souhaitez créer votre projet localement mais l'exécuter sur un autre ordinateur.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Cet extrait est utilisé pour lancer un nouveau processus sous le débogueur .NET (coreclr), en spécifiant le chemin d'accès à l'exécutable à lancer. Dans la plupart des cas, le \".NET : L'extrait \"Lancer le projet C#\" est un meilleur choix. Cet extrait est utile lorsque le projet a été créé en dehors de cette instance de VS Code ou que vous souhaitez héberger votre code .NET dans un exécutable personnalisé, tel qu'une version spécifique de 'dotnet.exe'/'dotnet' ou que le code .NET est hébergé. par une application native. Cet extrait est destiné aux applications Web (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Attacher à un processus .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Débogage à distance – Attacher à un processus .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web Assembly – Lancement du projet Blazor hébergé",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web Assembly – Lancer un projet Blazor autonome",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Lancer le fichier exécutable (Console)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Débogage à distance – Lancer le fichier exécutable (Console)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Lancer le fichier exécutable (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Cet extrait configure VS Code pour déboguer un projet C#. Les options de débogage (exemple : arguments de l'exécutable) peuvent être configurées via le fichier '<project-directory>/Properties/launchSettings.json'.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Lancer le projet C#",
   "debuggers.dotnet.launch.launchConfigurationId.description": "ID de configuration de lancement à utiliser. Une chaîne vide utilisera la configuration active actuelle.",
   "debuggers.dotnet.launch.projectPath.description": "Chemin du fichier .csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "Quand la valeur est true (état par défaut), le débogueur tente une évaluation plus rapide en simulant l’exécution de propriétés et de méthodes simples.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Si ce paramètre est spécifié, indique le nom du profil dans launchSettings.json à utiliser. Ceci est ignoré si launchSettings.json est introuvable. launchSettings.json sera lu à partir du chemin spécifié doit être la propriété 'launchSettingsFilePath', ou {cwd}/Properties/launchSettings.json si ce paramètre n’est pas défini. Si cette valeur est définie sur null ou une chaîne vide, launchSettings.json est ignoré. Si cette valeur n’est pas spécifiée, le premier profil 'Project' est utilisé.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Indicateur pour déterminer si le texte stdout du lancement du navigateur web doit être enregistré dans la fenêtre Sortie. Cette option a la valeur par défaut 'true'.",
   "generateOptionsSchema.logging.description": "Indicateurs permettant de déterminer les types de messages à enregistrer dans la fenêtre de sortie.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Si la valeur est true, la journalisation du moteur inclut les propriétés « adapterElapsedTime » et « engineElapsedTime » pour indiquer la durée, en microsecondes, nécessaire à une demande. Cette option a la valeur par défaut « false ».",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Indicateur permettant de déterminer si les journaux du moteur de diagnostic doivent être enregistrés dans la fenêtre de sortie. Cette option a la valeur par défaut « false ».",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Imprimez tous les appels d'API du débogueur. C'est très verbeux.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Échecs d'impression des appels d'API du débogueur.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Contrôle si les appels d'API à Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h doivent être imprimés dans la fenêtre de sortie. Cette option est par défaut « aucun ».",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Désactiver les appels d'API de traçage",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Indicateur permettant de déterminer si le suivi détaillé des événements déclenchés par le runtime sous-jacent doit être activé. Cette option est par défaut « false ».",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Paramètres permettant de contrôler quels messages sont imprimés dans la fenêtre de sortie à partir du journal de diagnostics du débogueur. Ce journal est destiné à aider à résoudre les problèmes liés au débogueur.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Imprimez les messages de diagnostic de niveau d'erreur.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Imprimez les messages de diagnostic importants.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Contrôle quels messages sont imprimés dans la fenêtre de sortie à partir du répartiteur du débogueur. S'il n'est pas spécifié, la valeur par défaut sera « aucun », sauf si l'un des paramètres de journal détaillés est activé (`debugEngineAPITracing`, `debugRuntimeEventTracing`, `expressionEvaluationTracing` ou `startDebuggingTracing`), auquel cas la valeur par défaut passe à `normal`.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "N'imprimez pas de messages de diagnostic supplémentaires.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Imprimez tous les messages de diagnostic non détaillés.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Indicateur permettant de déterminer si le suivi détaillé pour l’évaluation des expressions doit être activé. Cette option est par défaut « false ».",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Indicateur permettant de déterminer si les messages du protocole DAP échangés entre le débogueur C# et l'interface utilisateur doivent être enregistrés dans la fenêtre de sortie. Cette option est par défaut « false ».",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Indicateur permettant de déterminer si le suivi détaillé pour le démarrage du débogage doit être activé. Cette option est par défaut « false ».",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Si c'est vrai, la journalisation des messages de protocole inclura les propriétés `adapterElapsedTime` et `engineElapsedTime` pour indiquer la durée, en microsecondes, qu'une requête a prise. Cette option est par défaut « false ».",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "Le paramètre « logging.engineLogging » a été obsolète au profit de « logging.diagnosticsLog.protocolMessages ».",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Indicateur pour déterminer si les messages d’exception doivent être enregistrés dans la fenêtre de sortie. Cette option a la valeur par défaut « true ».",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Indicateur pour déterminer si les événements de chargement de module doivent être enregistrés dans la fenêtre de sortie. Cette option a la valeur par défaut « true ».",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Contrôle si un message est journalisé à la fermeture du processus cible ou si le débogage est arrêté. Cette option a la valeur par défaut 'true'.",
@@ -137,8 +193,8 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Chargez des symboles pour tous les modules, sauf si le module se trouve dans le tableau « excludedModules ».",
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "N’essayez pas de charger des symboles pour le module ANY, sauf s’il se trouve dans le tableau « includedModules » ou s’il est inclus par le biais du paramètre « includeSymbolsNextToModules ».",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Si la valeur est « true », le serveur de symboles Microsoft (https​://msdl.microsoft.com​/download/symbols) est ajouté au chemin de recherche des symboles. Si elle n’est pas spécifiée, cette option a la valeur par défaut « false ».",
-  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Si la valeur est « true », le serveur de symboles NuGet.org (https://symbols.nuget.org/download/symbols) est ajouté au chemin de recherche des symboles. Si elle n’est pas spécifiée, cette option a la valeur par défaut « false ».",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Tableau d’URL de serveur de symboles (exemple : http​://MyExampleSymbolServer) ou répertoires (exemple : /build/symbols) pour rechercher des fichiers .pdb. Ces répertoires seront recherchés en plus des emplacements par défaut, en regard du module et du chemin d’accès vers lequel le fichier pdb a été supprimé à l’origine.",
+  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Si la valeur est « true », le serveur de symboles NuGet.org (https​://symbols.nuget.org​/download/symbols) est ajouté au chemin de recherche des symboles. Si elle n’est pas spécifiée, cette option a la valeur par défaut « false ».",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Tableau d’URL de serveur de symboles (example: http​://MyExampleSymbolServer) ou répertoires (exemple : /build/symbols) pour rechercher des fichiers .pdb. Ces répertoires seront recherchés en plus des emplacements par défaut, en regard du module et du chemin d’accès vers lequel le fichier pdb a été supprimé à l’origine.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Uniquement pris en charge dans le débogage macOS local]\r\n\r\nArchitecture du débogué. Ce paramètre est automatiquement détecté, sauf si ce paramètre est défini. Les valeurs autorisées sont « x86_64 » ou « arm64 ».",
   "generateOptionsSchema.targetOutputLogPath.description": "Lorsqu’il est défini, le texte écrit par l’application cible dans stdout et stderr (par exemple, Console.WriteLine) est enregistré dans le fichier spécifié. Cette option est ignorée si la console a une valeur autre que internalConsole. Exemple : « ${workspaceFolder}/out.txt »",
   "viewsWelcome.debug.contents": "[Générer des ressources C# pour la génération et le débogage](command:dotnet.generateAssets)\r\n\r\nPour en savoir plus sur launch.json, consultez [Configuration de launch.json pour le débogage C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.it.json b/package.nls.it.json
index 17495d004..5faf24fdd 100644
--- a/package.nls.it.json
+++ b/package.nls.it.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Allega a un processo .NET 5+ o .NET Core",
+  "command.csharp.downloadDebugger": "Scarica il debugger di .NET Core",
+  "command.csharp.listProcess": "Elenca i processi per il collegamento",
+  "command.csharp.listRemoteDockerProcess": "Elenca i processi nella connessione Docker",
+  "command.csharp.listRemoteProcess": "Elenca i processi nella connessione remota per il collegamento",
+  "command.csharp.reportIssue": "Segnala un problema",
+  "command.csharp.showDecompilationTerms": "Mostra il contratto per i termini del decompilatore",
+  "command.dotnet.generateAssets.currentProject": "Genera gli asset per la compilazione e il debug",
+  "command.dotnet.openSolution": "Apri soluzione",
+  "command.dotnet.restartServer": "Riavvia il server di linguaggio",
+  "command.dotnet.restore.all": "Ripristina tutti i progetti",
+  "command.dotnet.restore.project": "Ripristina progetto",
+  "command.dotnet.test.debugTestsInContext": "Esegui il debug dei test nel contesto",
+  "command.dotnet.test.runTestsInContext": "Esegui test nel contesto",
+  "command.extension.showRazorCSharpWindow": "Mostra CSharp di Razor",
+  "command.extension.showRazorHtmlWindow": "Mostra HTML di Razor",
+  "command.o.fixAll.document": "Correggi tutte le occorrenze di un problema di codice all'interno del documento",
+  "command.o.fixAll.project": "Correggi tutte le occorrenze di un problema di codice all'interno del progetto",
+  "command.o.fixAll.solution": "Correggi tutte le occorrenze di un problema di codice all'interno della soluzione",
+  "command.o.pickProjectAndStart": "Seleziona progetto",
+  "command.o.reanalyze.allProjects": "Analizza tutti i progetti",
+  "command.o.reanalyze.currentProject": "Analizza il progetto corrente",
+  "command.o.restart": "Riavvia OmniSharp",
+  "command.razor.reportIssue": "Segnala problema Razor",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Mostra i suggerimenti per la creazione implicita di oggetti",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Mostra suggerimenti per variabili con tipi dedotti",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Mostra suggerimenti per i valori letterali",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Mostra suggerimenti per i tipi di parametro lambda",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Visualizza suggerimenti di tipo inline",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Eseguire l'analisi del codice in background per:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Eseguire l'analisi del codice in background per: (In precedenza “omnisharp.enableRoslynAnalyzers”)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Intera soluzione",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Nessuno",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Apri documenti",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Intera soluzione",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Nessuno",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Apri documenti",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Specifica se i riferimenti a CodeLens devono essere visualizzati.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Specifica se devono essere mostrati i CodeLens dei test di esecuzione e di debug.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Specifica se devono essere mostrati i CodeLens dei riferimenti. (In precedenza “csharp.referencesCodeLens.enabled”)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Specifica se devono essere mostrati i CodeLens dei test di esecuzione e di debug. (In precedenza “csharp.testsCodeLens.enabled”)",
   "configuration.dotnet.completion.provideRegexCompletions": "Mostra espressioni regolari nell'elenco di completamento.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Abilita il supporto per mostrare i tipi non importati e i metodi di estensione non importati negli elenchi di completamento. Quando viene eseguito il commit, la direttiva using appropriata verrà aggiunta all'inizio del file corrente.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Abilita il supporto per mostrare i tipi non importati e i metodi di estensione non importati negli elenchi di completamento. Quando viene eseguito il commit, la direttiva using appropriata verrà aggiunta all'inizio del file corrente. (In precedenza “omnisharp.enableImportCompletion”)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Consente di eseguire il completamento automatico del nome dell'oggetto per i membri selezionati di recente.",
-  "configuration.dotnet.defaultSolution.description": "Percorso della soluzione predefinita da aprire nell'area di lavoro o impostare su 'disabilita' per ignorarla.",
+  "configuration.dotnet.defaultSolution.description": "Percorso della soluzione predefinita da aprire nell'area di lavoro o impostare su 'disabilita' per ignorarla. (In precedenza “omnisharp.defaultLaunchSolution”)",
   "configuration.dotnet.dotnetPath": "Specifica il percorso di una directory di installazione dotnet da usare al posto di quella predefinita del sistema. Ciò influisce solo sull'installazione di dotnet da usare per ospitare il server di linguaggio stesso. Esempio: \"/home/username/mycustomdotnetdirectory\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Evidenziare i componenti JSON correlati sotto il cursore.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Evidenzia i componenti dell'espressione regolare correlati sotto il cursore.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Elimina hint quando l'argomento corrisponde al nome del parametro",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Non visualizzare suggerimenti quando il nome del parametro corrisponde alla finalità del metodo",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Abilita la navigazione verso origini decompilate.",
+  "configuration.dotnet.preferCSharpExtension": "Forza il caricamento dei progetti solo con l'estensione C#.  Può essere utile quando si usano tipi di progetto legacy non supportati dal Kit di sviluppo C#. (Richiede il ricaricamento della finestra)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostra le informazioni sulle note quando viene visualizzato il simbolo.",
+  "configuration.dotnet.server.crashDumpPath": "Imposta un percorso cartella in cui vengono scritti i dump di arresto anomalo del sistema in caso di arresto anomalo del server di linguaggio.  Deve essere scrivibile dall'utente.",
   "configuration.dotnet.server.extensionPaths": "Eseguire l’override per il percorso del server di linguaggio --argomenti estensione",
-  "configuration.dotnet.server.path": "Specifica il percorso assoluto dell'eseguibile del server (LSP od O#). Se lasciato vuoto, viene usata la versione aggiunta all'estensione C#.",
+  "configuration.dotnet.server.path": "Specifica il percorso assoluto dell'eseguibile del server (LSP od O#). Se lasciato vuoto, viene usata la versione aggiunta all'estensione C#. (In precedenza “omnisharp.path”)",
+  "configuration.dotnet.server.startTimeout": "Specifica un timeout (in ms) per l'avvio del client e la sua connessione al server di linguaggio.",
   "configuration.dotnet.server.trace": "Imposta il livello di registrazione per il server di linguaggio",
-  "configuration.dotnet.server.waitForDebugger": "Passa il flag --debug all'avvio del server per consentire il collegamento di un debugger.",
+  "configuration.dotnet.server.waitForDebugger": "Passa il flag --debug all'avvio del server per consentire il collegamento di un debugger. (In precedenza “omnisharp.waitForDebugger”)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Cerca simboli negli assembly di riferimento. Influisce sulle funzionalità che richiedono la ricerca di simboli, ad esempio l'aggiunta di importazioni.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Opzioni da usare con il debugger durante l'avvio per unit test debug.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Opzioni da usare con il debugger durante l'avvio per unit test debug. (In precedenza “csharp.unitTestDebuggingOptions”)",
   "configuration.razor.languageServer.debug": "Specifica se attendere il collegamento di debug all'avvio del server di linguaggio.",
   "configuration.razor.languageServer.directory": "Esegue l'override del percorso della directory del server di linguaggio Razor.",
   "configuration.razor.trace": "Specifica se visualizzare tutti i messaggi [Verbose], alcuni messaggi [Messages] o meno [Off].",
   "configuration.razor.trace.messages": "Registra solo alcuni messaggi dall'estensione Razor",
   "configuration.razor.trace.off": "Non registra i messaggi dall'estensione Razor",
   "configuration.razor.trace.verbose": "Registra tutti i messaggi dall'estensione Razor",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Collegare il debugger .NET (coreclr) a un processo in esecuzione. Questa operazione può essere eseguita anche utilizzando il comando \"Collega a un processo .NET 5+ o .NET Core\".",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Questo frammento di codice viene usato per avviare un nuovo processo nel debugger Blazor WebAssembly (blazorwasm), specificando il percorso dell'eseguibile da avviare. Nella maggior parte dei casi, il frammento di codice \".NET: Il frammento di codice Launch C# project\" è una scelta migliore, ma può essere utilizzato per avere il controllo completo su tutte le opzioni di avvio. Questo frammento di codice riguarda i progetti Blazor ospitati, ovvero un progetto che dispone di un'app ASP.NET Core back-end per gestire i file.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Questo frammento di codice viene usato per avviare un nuovo processo nel debugger Blazor WebAssembly (blazorwasm). Nella maggior parte dei casi, il frammento di codice \".NET: Il frammento di codice Launch C# project\" è una scelta migliore, ma può essere utilizzato per avere il controllo completo su tutte le opzioni di avvio. Questo frammento di codice è per progetti Blazor autonomi, ovvero un progetto che non dispone di un'app ASP.NET Core back-end per gestire i file.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Questo frammento di codice viene utilizzato per avviare un nuovo processo nel debugger .NET (coreclr), specificando il percorso dell'eseguibile da avviare. Nella maggior parte dei casi, il frammento di codice \".NET: Launch C# project\" è una scelta migliore. Questo frammento di codice è utile quando il progetto è stato creato all'esterno di questa istanza di VS Code o se si desidera ospitare il codice .NET in un eseguibile personalizzato, ad esempio una versione specifica di \"dotnet.exe\"/\"dotnet\" o il codice .NET è ospitato da un'applicazione nativa. Questo frammento di codice è per applicazioni console.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Questo frammento di codice mostra come eseguire il debug remoto di .NET Code **senza** utilizzare la comunicazione remota VS Code. Dovrebbe essere utilizzato nei casi in cui si desidera creare il progetto localmente ma eseguirlo su un altro computer.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Questo frammento di codice viene utilizzato per avviare un nuovo processo nel debugger .NET (coreclr), specificando il percorso dell'eseguibile da avviare. Nella maggior parte dei casi, il frammento di codice \".NET: Launch C# project\" è una scelta migliore. Questo frammento di codice è utile quando il progetto è stato creato all'esterno di questa istanza di VS Code o se si desidera ospitare il codice .NET in un eseguibile personalizzato, ad esempio una versione specifica di \"dotnet.exe\"/\"dotnet\" o il codice .NET è ospitato da un'applicazione nativa. Questo frammento di codice è per le applicazioni Web (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Collega a un processo .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Debug remoto: collegamento a un processo .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web Assembly - Avvia il progetto Blazor ospitato",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web Assembly: avvia il progetto Blazor autonomo",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Avvia il file eseguibile (Console)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Debug remoto: avvia il file eseguibile (Console)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Avvia il file eseguibile (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Questo frammento di codice configura VS Code per eseguire il debug di un progetto C#. Le opzioni di debug, ad esempio gli argomenti dell'eseguibile, possono essere configurate tramite il file \"<project-directory>/Properties/launchSettings.json\".",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Launch C# project",
   "debuggers.dotnet.launch.launchConfigurationId.description": "ID configurazione di avvio da usare. Se la stringa è vuota, verrà usata la configurazione attiva corrente.",
   "debuggers.dotnet.launch.projectPath.description": "Percorso del file con estensione csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "Se impostato su true (che è lo stato predefinito), il debugger cercherà di effettuare una valutazione più rapida, simulando l'esecuzione di metodi e proprietà semplici.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Se specificato, questo parametro indica il nome del profilo da utilizzare in launchSettings.json. Se launchSettings.json non viene trovato, l'opzione viene ignorata. Il file verrà letto dal percorso indicato nella proprietà 'launchSettingsFilePath' o da {cwd}/Properties/launchSettings.json se tale proprietà non è impostata. Se questa opzione è impostata su null o su una stringa vuota, launchSettings.json verrà completamente ignorato. Se il valore non è specificato, verrà utilizzato il primo profilo denominato 'Progetto'.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Flag utilizzato per stabilire se il testo di stdout proveniente dall'avvio del browser Web debba essere registrato nella finestra di output. Il valore predefinito per questa opzione è 'true'.",
   "generateOptionsSchema.logging.description": "Flag utilizzato per stabilire i tipi di messaggi da registrare nella finestra di output.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Se impostata su true, la registrazione del motore includerà le proprietà 'adapterElapsedTime' ed 'engineElapsedTime' per indicare la quantità di tempo, misurata in microsecondi, impiegata per una richiesta. Il valore predefinito di questa opzione è 'false'.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Flag utilizzato per stabilire se i log del motore di diagnostica devono essere registrati nella finestra di output. Il valore predefinito per questa opzione è 'false'.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Stampa tutte le chiamate API del debugger. Si tratta di un documento molto dettagliato.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Errori di stampa dalle chiamate API del debugger.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Controlla se le chiamate API a Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h debbano essere stampate nella finestra di output. Il valore predefinito di questa opzione è 'none'.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Disabilita chiamate API di traccia",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Contrassegna per stabilire se è necessario abilitare la traccia dettagliata per gli eventi generati dal runtime sottostante. Il valore predefinito di questa opzione è 'false'.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Impostazioni per controllare quali messaggi vengono stampati nella finestra di output dal log di diagnostica del debugger. Questo log contribuisce alla risoluzione dei problemi del debugger.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Stampa messaggi di diagnostica a livello di errore.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Stampa messaggi di diagnostica importanti.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Controlla quali messaggi vengono stampati nella finestra di output dal dispatcher del debugger. Se non è specificato, verrà impostato su 'none' a meno che non sia abilitata una delle impostazioni del log dettagliate ('debugEngineAPITracing', 'debugRuntimeEventTracing', 'expressionEvaluationTracing' o 'startDebuggingTracing'), nel qual caso il valore predefinito viene modificato in 'normal'.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Non stampare altri messaggi di diagnostica.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Stampa tutti i messaggi di diagnostica non dettagliati.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Contrassegna per stabilire se è necessario abilitare la traccia dettagliata per la valutazione dell'espressione. Il valore predefinito di questa opzione è 'false'.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Contrassegna per stabilire se i messaggi del protocollo DAP scambiati tra il debugger C# e l'interfaccia utente devono essere registrati nella finestra di output. Il valore predefinito di questa opzione è 'false'.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Contrassegna per stabilire se è necessario abilitare la traccia dettagliata per l'avvio del debug. Il valore predefinito di questa opzione è 'false'.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Se impostata su true, la registrazione dei messaggi di protocollo includerà le proprietà 'adapterElapsedTime' ed 'engineElapsedTime' per indicare la quantità di tempo, misurata in microsecondi, impiegata per una richiesta. Il valore predefinito di questa opzione è 'false'.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "L'impostazione 'logging.engineLogging' è stata deprecata e sostituita da 'logging.diagnosticsLog.protocolMessages'.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Flag utilizzato per stabilire se i messaggi di eccezione devono essere registrati nella finestra di output. L'impostazione predefinita di questa opzione è 'true'.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Flag utilizzato per stabilire se gli eventi di caricamento del modulo devono essere registrati nella finestra di output. Il valore predefinito per questa opzione è 'true'.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Controlla se un messaggio viene registrato alla chiusura del processo di destinazione o se il debug viene arrestato. Il valore predefinito per questa opzione è 'true'.",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "Non provare a caricare i simboli per qualsiasi modulo a meno che non si trovi nella matrice 'includedModules' oppure non sia incluso tramite l'impostazione 'includeSymbolsNextToModules'.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Se 'true', il server dei simboli Microsoft (https​://msdl.microsoft.com​/download/symbols) viene aggiunto al percorso di ricerca dei simboli. Se non è specificata, l'impostazione predefinita di questa opzione è 'false'.",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Se impostato su 'true', il server dei simboli NuGet.org (https​://symbols.nuget.org​/download/symbols) verrà aggiunto al percorso di ricerca dei simboli. Se non viene specificato, il valore predefinito per questa opzione è 'false'.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Matrice di URL del server dei simboli, ad esempio http​://MyExampleSymbolServer, o di directory, ad esempio /build/symbols, in cui eseguire la ricerca dei file PDB. La ricerca verrà eseguita in queste directory oltre che nei percorsi predefiniti, in aggiunta al modulo e al percorso in cui è stato rilasciato originariamente il file PDB.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Matrice di URL del server dei simboli (ad esempio: http​://MyExampleSymbolServer) o directory (ad esempio: /build/symbols) per cercare file .pdb. Verranno eseguite ricerche in queste directory oltre ai percorsi predefiniti, accanto al modulo e al percorso in cui è stato originariamente eliminato il pdb.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Supportato solo nel debug di macOS in locale]\r\n\r\nArchitettura dell'oggetto del debug. Verrà rilevata automaticamente a meno che non sia impostato questo parametro. I valori consentiti sono `x86_64` or `arm64`.",
   "generateOptionsSchema.targetOutputLogPath.description": "Quando questa opzione è impostata, il testo che l'applicazione di destinazione scrive in stdout e stderr, ad esempio Console.WriteLine, verrà salvato nel file specificato. Questa opzione viene ignorata se la console è impostata su un valore diverso da internalConsole. Ad esempio '${workspaceFolder}/out.txt'.",
   "viewsWelcome.debug.contents": "[Genera risorse C# per compilazione e debug](command:dotnet.generateAssets)\r\n\r\nPer altre informazioni su launch.json, vedere [Configurazione di launch.json per il debug di C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.ja.json b/package.nls.ja.json
index 7bd78cb2b..072608fc0 100644
--- a/package.nls.ja.json
+++ b/package.nls.ja.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": ".NET 5 以降または .NET Core プロセスにアタッチする",
+  "command.csharp.downloadDebugger": ".NET Core デバッガーをダウンロードする",
+  "command.csharp.listProcess": "アタッチのプロセスをリスト表示する",
+  "command.csharp.listRemoteDockerProcess": "Docker 接続のプロセスをリスト表示する",
+  "command.csharp.listRemoteProcess": "アタッチ用のリモート接続のプロセスをリスト表示する",
+  "command.csharp.reportIssue": "問題の報告",
+  "command.csharp.showDecompilationTerms": "逆コンパイラの使用契約条件を表示する",
+  "command.dotnet.generateAssets.currentProject": "ビルド用およびデバッグ用の資産を生成する",
+  "command.dotnet.openSolution": "ソリューションを開く",
+  "command.dotnet.restartServer": "言語サーバーを再起動する",
+  "command.dotnet.restore.all": "すべてのプロジェクトを復元する",
+  "command.dotnet.restore.project": "プロジェクトの復元",
+  "command.dotnet.test.debugTestsInContext": "コンテキストでテストをデバッグする",
+  "command.dotnet.test.runTestsInContext": "コンテキストでテストを実行する",
+  "command.extension.showRazorCSharpWindow": "Razor CSharp を表示する",
+  "command.extension.showRazorHtmlWindow": "Razor Html を表示する",
+  "command.o.fixAll.document": "ドキュメント内のコードの問題のすべての出現箇所を修正する",
+  "command.o.fixAll.project": "プロジェクト内のコードの問題のすべての出現箇所を修正する",
+  "command.o.fixAll.solution": "ソリューション内のコードの問題のすべての出現箇所を修正する",
+  "command.o.pickProjectAndStart": "プロジェクトの選択",
+  "command.o.reanalyze.allProjects": "すべてのプロジェクトを分析する",
+  "command.o.reanalyze.currentProject": "現在のプロジェクトを分析する",
+  "command.o.restart": "OmniSharp を再起動する",
+  "command.razor.reportIssue": "Razor の問題を報告する",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "暗黙的なオブジェクト作成のヒントを表示します",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "推論された型の変数のヒントを表示する",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "インデクサーのヒントを表示する",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "ラムダ パラメーター型のヒントを表示する",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "インライン型のヒントを表示する",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "バックグラウンド コード分析の対象:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "次のバックグラウンド コード分析を実行します: (以前の `omnisharp.enableRoslynAnalyzers`)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "ソリューション全体",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "なし",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "開かれているドキュメント",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "ソリューション全体",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "なし",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "開かれているドキュメント",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "参照 CodeLens を表示するかどうかを指定します。",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "CodeLens のテストの実行とデバッグを表示するかどうかを指定します。",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "参照 CodeLens を表示するかどうかを指定します。(以前は `csharp.referencesCodeLens.enabled`)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "CodeLens の実行テストとデバッグ テストを表示するかどうかを指定します。(以前の `csharp.testsCodeLens.enabled`)",
   "configuration.dotnet.completion.provideRegexCompletions": "入力候補一覧に正規表現を表示します。",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "インポートされていない型とインポートされていない拡張メソッドを入力候補一覧に表示するサポートを有効にします。コミットすると、適切な using ディレクティブが現在のファイルの先頭に追加されます。",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "インポートされていない型とインポートされていない拡張メソッドを入力候補一覧に表示するためのサポートを有効にします。コミットすると、現在のファイルの先頭に適切な using ディレクティブが追加されます。(以前の `omnisharp.enableImportCompletion`)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "最近選択したメンバーの自動オブジェクト名の完了を実行します。",
-  "configuration.dotnet.defaultSolution.description": "ワークスペースで開く既定のソリューションのパス。スキップするには 'disable' に設定します。",
+  "configuration.dotnet.defaultSolution.description": "ワークスペースで開く既定のソリューションのパス。スキップするには 'disable' に設定します。(以前の `omnisharp.defaultLaunchSolution`)",
   "configuration.dotnet.dotnetPath": "既定のシステム ディレクトリの代わりに使用する dotnet インストール ディレクトリへのパスを指定します。これは、言語サーバー自体をホストするために使用する dotnet インストールにのみ影響します。例: \"/home/username/mycustomdotnetdirectory\"。",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "カーソルの下にある関連する JSON コンポーネントをハイライトします。",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "カーソルの下にある関連する正規表現コンポーネントをハイライトします。",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "引数がパラメーター名と一致するとき、ヒントを抑制する",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "パラメーター名がメソッドの意図と一致する場合にヒントを非表示にする",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "逆コンパイルされたソースへのナビゲーションを有効にします。",
+  "configuration.dotnet.preferCSharpExtension": "C# 拡張機能のみを使用してプロジェクトを強制的に読み込みます。 これは、C# Dev Kit でサポートされていないレガシ プロジェクトの種類を使用する場合に役立ちます。(ウィンドウの再読み込みが必要)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "シンボルを表示するときに注釈情報を表示します。",
+  "configuration.dotnet.server.crashDumpPath": "言語サーバーがクラッシュした場合にクラッシュ ダンプの書き込み先フォルダー パスを設定します。ユーザーによる書き込みが可能であることが必要です。",
   "configuration.dotnet.server.extensionPaths": "言語サーバーへのパスのオーバーライド --拡張引数",
-  "configuration.dotnet.server.path": "サーバー (LSP または O#) 実行可能ファイルに絶対パスを指定します。空のままにすると、C# 拡張機能にピン留めされたバージョンが使用されます。",
+  "configuration.dotnet.server.path": "サーバー (LSP または O#) 実行可能ファイルに絶対パスを指定します。空のままにすると、C# 拡張機能にピン留めされたバージョンが使用されます。(以前の `omnisharp.path`)",
+  "configuration.dotnet.server.startTimeout": "クライアントが正常に起動して言語サーバーに接続するためのタイムアウト (ミリ秒) を指定します。",
   "configuration.dotnet.server.trace": "言語サーバーのログ記録レベルを設定する",
-  "configuration.dotnet.server.waitForDebugger": "サーバーの起動時に --debug フラグを渡して、デバッガーのアタッチを許可します。",
+  "configuration.dotnet.server.waitForDebugger": "デバッガーのアタッチを許可するために、サーバーを起動するときに --debug フラグを渡します。(以前の `omnisharp.waitForDebugger`)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "参照アセンブリ内のシンボルを検索します。影響を受ける機能には、インポートの追加などのシンボル検索が必要です。",
-  "configuration.dotnet.unitTestDebuggingOptions": "単位テスト デバッグの起動時にデバッガーで使用するオプションです。",
+  "configuration.dotnet.unitTestDebuggingOptions": "単体テスト デバッグの起動時にデバッガーで使用するオプション。(以前の `csharp.unitTestDebuggingOptions`)",
   "configuration.razor.languageServer.debug": "言語サーバーの起動時にデバッグ アタッチを待機するかどうかを指定します。",
   "configuration.razor.languageServer.directory": "Razor Language Server ディレクトリへのパスをオーバーライドします。",
   "configuration.razor.trace": "すべてのメッセージ [詳細] を出力するか、一部のメッセージ [メッセージ] を出力するか、何も出力しない [オフ] かを指定します。",
   "configuration.razor.trace.messages": "Razor 拡張機能からの一部のメッセージのみをログに記録します",
   "configuration.razor.trace.off": "Razor 拡張機能からのメッセージをログに記録しません",
   "configuration.razor.trace.verbose": "Razor 拡張機能からのすべてのメッセージをログに記録します",
+  "debuggers.coreclr.configurationSnippets.description.attach": "実行中のプロセスに .NET デバッガー (coreclr) をアタッチします。これは、'.NET 5 以降または .NET Core プロセスにアタッチする' コマンドを使用して行うこともできます。",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "このスニペットは、起動する実行可能ファイルへのパスを指定して、Blazor WebAssembly デバッガー (blazorwasm) で新しいプロセスを起動するために使用されます。ほとんどの場合、\".NET: Launch C# プロジェクト\" スニペットの方が適切ですが、このスニペットを使用すると、すべての起動オプションを完全に制御できます。このスニペットは、ホストされている Blazor プロジェクト用です。これは、ファイルを提供するバックエンド ASP.NET Core アプリを持つプロジェクトです。",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "このスニペットは、Blazor WebAssembly デバッガー (blazorwasm) で新しいプロセスを起動するために使用されます。ほとんどの場合、\".NET: Launch C# プロジェクト\" スニペットの方が適切ですが、このスニペットを使用すると、すべての起動オプションを完全に制御できます。このスニペットは、スタンドアロン Blazor プロジェクト用です。これは、ファイルを提供するバックエンド ASP.NET Core アプリを持たないプロジェクトです。",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "このスニペットは、.NET デバッガー (coreclr) の下で新しいプロセスを起動するために使用され、起動する実行可能ファイルへのパスを指定します。ほとんどの場合、\".NET: C# プロジェクトを起動する\" スニペットが最適です。このスニペットは、プロジェクトがこの VS Code インスタンスの外部でビルドされた場合、または .NET Code をカスタム実行可能ファイル (特定のバージョンの 'dotnet.exe'/'dotnet' など) でホストする場合、または .NET Code がネイティブ アプリケーションによってホストされている場合に役立ちます。このスニペットはコンソール アプリケーション用です。",
+  "debuggers.coreclr.configurationSnippets.description.remote": "このスニペットは、VS Code リモートを使用して .NET Code **without** をリモートでデバッグする方法示します。プロジェクトをローカルでビルドし、別のコンピューターで実行する場合に使用する必要があります。",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "このスニペットは、.NET デバッガー (coreclr) の下で新しいプロセスを起動するために使用され、起動する実行可能ファイルへのパスを指定します。ほとんどの場合、\".NET: C# プロジェクトを起動する\" スニペットが最適です。このスニペットは、プロジェクトがこの VS Code インスタンスの外部でビルドされた場合、または .NET Code をカスタム実行可能ファイル (特定のバージョンの 'dotnet.exe'/'dotnet' など) でホストする場合、または .NET Code がネイティブ アプリケーションによってホストされている場合に役立ちます。このスニペットは Web (ASP.NET Core) アプリケーション用です。",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: .NET プロセスにアタッチする",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: リモート デバッグ - .NET プロセスへのアタッチ",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web アセンブリ - ホストされている Blazor プロジェクトを起動します",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web アセンブリ - スタンドアロン Blazor プロジェクトを起動します",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: 実行可能ファイルの起動 (コンソール)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: リモート デバッグ - 実行可能ファイルの起動 (コンソール)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: 実行可能ファイルの起動 (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "このスニペットは、C# プロジェクトをデバッグするため VS Code を構成します。デバッグ オプション (例: 実行可能ファイルへの引数) は、'<project-directory>/Properties/launchSettings.json' ファイルを使用して構成できます。",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: C# プロジェクトの起動",
   "debuggers.dotnet.launch.launchConfigurationId.description": "使用する起動構成 ID。空の場合は現在アクティブな構成が使用されます。",
   "debuggers.dotnet.launch.projectPath.description": ".csproj ファイルへのパス。",
   "generateOptionsSchema.allowFastEvaluate.description": "true (既定の状態) の場合、デバッガーは単純なプロパティとメソッドの実行をシミュレーションすることで、より高速な評価を試みます。",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "指定した場合、使用する launchSettings.json 内のプロファイルの名前を示します。launchSettings.json が見つからない場合、これは無視されます。launchSettings.json は、'launchSettingsFilePath' プロパティで指定されたパスから読み取られ、それが設定されていない場合は {cwd}/Properties/launchSettings.json から読み込まれます。これが null または空の文字列に設定されている場合、launchSettings.json は無視されます。この値が指定されていない場合は、最初の 'Project' プロファイルが使用されます。",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Web ブラウザーを起動してから StdOut テキストを出力ウィンドウに記録するかどうかを決定するフラグです。このオプションの既定値は `true` です。",
   "generateOptionsSchema.logging.description": "どの種類のメッセージを出力ウィンドウに記録する必要があるかを決定するフラグです。",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "true の場合、エンジン ログには `adapterElapsedTime` プロパティと `engineElapsedTime` プロパティが含まれ、要求にかかった時間をマイクロ秒単位で示します。このオプションの既定値は `false` です。",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "診断エンジンのログを出力ウィンドウに記録するかどうかを決定するフラグ。このオプションの既定値は `false` です。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "すべてのデバッガー API 呼出しを出力します。これは、非常に詳細です。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "デバッガー API 呼び出しからのエラーを出力します。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h への API 呼び出しを出力ウィンドウに出力するかどうかを制御します。このオプションの既定値は `none` です。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "API 呼び出しのトレースを無効にする",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "基になるランタイムによって発生するイベントについての詳細トレースを有効にするかどうかを決定するフラグ。このオプションの既定値は、`false` です。",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "デバッガーの診断ログから出力ウィンドウに出力するメッセージを制御する設定です。このログは、デバッガーの問題のトラブルシューティングに役立ちます。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "エラーレベルの診断メッセージを出力します。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "重要な診断メッセージを出力します。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "デバッガーのディスパッチャーから出力ウィンドウに出力するメッセージを制御します。指定がない場合の既定値は `none` です。ただし、いずれかの詳細ログ設定 (`debugEngineAPITracing`、`debugRuntimeEventTracing`、`expressionEvaluationTracing` または `startDebuggingTracing`) が有効な場合、デフォルト値は `normal` に変更されます。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "追加の診断メッセージは出力しません。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "すべての詳細でない診断メッセージを出力します。",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "式評価についての詳細トレースを有効にするかどうかを決定するフラグ。このオプションの既定値は、`false` です。",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "C# デバッガーと UI の間で交換される DAP プロトコル メッセージを出力ウィンドウにログ出力するかどうかを決定するフラグ。このオプションの既定値は、`false` です。",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "デバッグの開始についての詳細トレースを有効にするかどうかを決定するフラグ。このオプションの既定値は、`false` です。",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "true の場合、プロトコル メッセージ ログには `adapterElapsedTime` プロパティと `engineElapsedTime` プロパティが含まれ、要求にかかった時間がマイクロ秒単位で示されます。このオプションの既定値は `false` です。",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "'logging.engineLogging' は非推奨になりました。'logging.diagnosticsLog.protocolMessages' を使用してください。",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "例外メッセージを出力ウィンドウに記録するかどうかを決定するフラグです。このオプションの既定値は `true` です。",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "モジュール読み込みイベントを出力ウィンドウに記録するかどうかを決定するフラグです。このオプションの既定値は `true` です。",
   "generateOptionsSchema.logging.processExit.markdownDescription": "ターゲット プロセスを終了するとき、またはデバッグを停止するときにメッセージをログに記録するかどうかを制御します。このオプションの既定値は `true` です。",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "モジュールが 'includedModules' 配列に含まれていない場合、または 'includeSymbolsNextToModules' 設定を介して含まれていない場合は、どのモジュールに対してもシンボルを読み込もうとしてはいけません。",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "'true' の場合、Microsoft シンボルサーバー (https​://msdl.microsoft.com​/download/symbols) がシンボルの検索パスに追加されます。指定しない場合、このオプションの既定値は 'false' です。",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "'true' の場合、NuGet.org シンボルサーバー (https​://symbols.nuget.org​/download/symbols) がシンボルの検索パスに追加されます。指定しない場合、このオプションの既定値は 'false' です。",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": ".pdb ファイルを検索するためのシンボル サーバー URL (例: http​://MyExampleSymbolServer) の配列またはディレクトリ (例: /build/symbols) の配列です。これらのディレクトリは、既定の場所 (すなわちモジュールと、 pdb が最初にドロップされたパスの横) に加えて、検索されます。",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "シンボル サーバーの URL (example: http​://MyExampleSymbolServer) またはディレクトリ (example: /build/symbols) の配列であり、ここで .pdb ファイルが検索されます。既定の場所に加えて (つまり、モジュールと、pdb が最初にドロップされたパスの後に)、これらのディレクトリが検索されることになります。",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[ローカルの macOS デバッグのみでサポート]\r\n\r\nデバッグ対象のアーキテクチャ。このパラメーターを設定しない場合は、自動的に検出されます。可能な値は、 `x86_64` または `arm64`. です。",
   "generateOptionsSchema.targetOutputLogPath.description": "設定すると、ターゲット アプリケーションが StdOut および stderr (例: Console.WriteLine) に書き込むテキストが指定したファイルに保存されます。コンソールが internalConsole 以外に設定されている場合、このオプションは無視されます。例: '${workspaceFolder}/out.txt'",
   "viewsWelcome.debug.contents": "[ビルドおよびデバッグ用の C# 資産の生成](command:dotnet.generateAssets)\r\n\r\nlaunch.json の詳細については、[C# デバッグ用の launch.json の構成](https://aka.ms/VSCode-CS-LaunchJson). を参照してください。"
diff --git a/package.nls.json b/package.nls.json
index b1856743d..44c4fffff 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -1,22 +1,49 @@
 {
-  "configuration.dotnet.defaultSolution.description": "The path of the default solution to be opened in the workspace, or set to 'disable' to skip it.",
+  "command.o.restart": "Restart OmniSharp",
+  "command.o.pickProjectAndStart": "Select Project",
+  "command.dotnet.openSolution": "Open Solution",
+  "command.o.fixAll.solution": "Fix all occurrences of a code issue within solution",
+  "command.o.fixAll.project": "Fix all occurrences of a code issue within project",
+  "command.o.fixAll.document": "Fix all occurrences of a code issue within document",
+  "command.o.reanalyze.allProjects": "Analyze all projects",
+  "command.o.reanalyze.currentProject": "Analyze current project",
+  "command.dotnet.generateAssets.currentProject": "Generate Assets for Build and Debug",
+  "command.dotnet.restore.project": "Restore Project",
+  "command.dotnet.restore.all": "Restore All Projects",
+  "command.csharp.downloadDebugger": "Download .NET Core Debugger",
+  "command.csharp.listProcess": "List process for attach",
+  "command.csharp.listRemoteProcess": "List processes on remote connection for attach",
+  "command.csharp.listRemoteDockerProcess": "List processes on Docker connection",
+  "command.csharp.attachToProcess": "Attach to a .NET 5+ or .NET Core process",
+  "command.csharp.reportIssue": "Report an issue",
+  "command.csharp.showDecompilationTerms": "Show the decompiler terms agreement",
+  "command.extension.showRazorCSharpWindow": "Show Razor CSharp",
+  "command.extension.showRazorHtmlWindow": "Show Razor Html",
+  "command.razor.reportIssue": "Report a Razor issue",
+  "command.dotnet.test.runTestsInContext": "Run Tests in Context",
+  "command.dotnet.test.debugTestsInContext": "Debug Tests in Context",
+  "command.dotnet.restartServer": "Restart Language Server",
+  "configuration.dotnet.defaultSolution.description": "The path of the default solution to be opened in the workspace, or set to 'disable' to skip it. (Previously `omnisharp.defaultLaunchSolution`)",
   "configuration.dotnet.dotnetPath": "Specifies the path to a dotnet installation directory to use instead of the default system one. This only influences the dotnet installation to use for hosting the language server itself. Example: \"/home/username/mycustomdotnetdirectory\".",
-  "configuration.dotnet.server.path": "Specifies the absolute path to the server (LSP or O#) executable. When left empty the version pinned to the C# Extension is used.",
-  "configuration.dotnet.server.waitForDebugger": "Passes the --debug flag when launching the server to allow a debugger to be attached.",
+  "configuration.dotnet.server.path": "Specifies the absolute path to the server (LSP or O#) executable. When left empty the version pinned to the C# Extension is used. (Previously `omnisharp.path`)",
+  "configuration.dotnet.server.startTimeout": "Specifies a timeout (in ms) for the client to successfully start and connect to the language server.",
+  "configuration.dotnet.server.waitForDebugger": "Passes the --debug flag when launching the server to allow a debugger to be attached. (Previously `omnisharp.waitForDebugger`)",
   "configuration.dotnet.server.trace": "Sets the logging level for the language server",
   "configuration.dotnet.server.extensionPaths": "Override for path to language server --extension arguments",
+  "configuration.dotnet.server.crashDumpPath": "Sets a folder path where crash dumps are written to if the language server crashes.  Must be writeable by the user.",
+  "configuration.dotnet.preferCSharpExtension": "Forces projects to load with the C# extension only.  This can be useful when using legacy project types that are not supported by C# Dev Kit. (Requires window reload)",
   "configuration.dotnet.implementType.insertionBehavior": "The insertion location of properties, events, and methods When implement interface or abstract class.",
   "configuration.dotnet.implementType.insertionBehavior.withOtherMembersOfTheSameKind": "Place them with other members of the same kind.",
   "configuration.dotnet.implementType.insertionBehavior.atTheEnd": "Place them at the end.",
   "configuration.dotnet.implementType.propertyGenerationBehavior": "Generation behavior of properties when implement interface or abstract class.",
   "configuration.dotnet.implementType.propertyGenerationBehavior.preferThrowingProperties": "Prefer throwing properties.",
   "configuration.dotnet.implementType.propertyGenerationBehavior.preferAutoProperties": "Prefer auto properties.",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Specifies whether the references CodeLens should be shown.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Specifies whether the run and debug test CodeLens should be shown.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Enables support for showing unimported types and unimported extension methods in completion lists. When committed, the appropriate using directive will be added at the top of the current file.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Specifies whether the references CodeLens should be shown. (Previously `csharp.referencesCodeLens.enabled`)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Specifies whether the run and debug test CodeLens should be shown. (Previously `csharp.testsCodeLens.enabled`)",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Enables support for showing unimported types and unimported extension methods in completion lists. When committed, the appropriate using directive will be added at the top of the current file. (Previously `omnisharp.enableImportCompletion`)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Perform automatic object name completion for the members that you have recently selected.",
   "configuration.dotnet.completion.provideRegexCompletions": "Show regular expressions in completion list.",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Run background code analysis for:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Run background code analysis for: (Previously `omnisharp.enableRoslynAnalyzers`)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Open documents",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Entire solution",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "None",
@@ -41,24 +68,69 @@
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Enable navigation to decomplied sources.",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Show remarks information when display symbol.",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Search symbols in reference assemblies. It affects features requires symbol searching, such as add imports.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Options to use with the debugger when launching for unit test debugging.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Options to use with the debugger when launching for unit test debugging. (Previously `csharp.unitTestDebuggingOptions`)",
   "configuration.razor.languageServer.directory": "Overrides the path to the Razor Language Server directory.",
   "configuration.razor.languageServer.debug": "Specifies whether to wait for debug attach when launching the language server.",
   "configuration.razor.trace": "Specifies whether to output all messages [Verbose], some messages [Messages] or not at all [Off].",
   "configuration.razor.trace.off": "Does not log messages from the Razor extension",
   "configuration.razor.trace.messages": "Logs only some messages from the Razor extension",
   "configuration.razor.trace.verbose": "Logs all messages from the Razor extension",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Launch Executable file (Console)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Launch Executable file (Web)",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Attach to a .NET process",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Remote debugging - Launch Executable file (Console)",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Remote debugging - Attach to a .NET process",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web Assembly - Launch hosted Blazor project",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web Assembly - Launch standalone Blazor project",
+  "debuggers.coreclr.configurationSnippets.description.console-local": {
+    "message" : "This snippet is used to launch a new process under the .NET debugger (coreclr), specifying the path to the executable to launch. In most cases, the \".NET: Launch C# project\" snippet is a better choice. This snippet is useful when the project was built outside this VS Code instance or you want to host your .NET Code in a custom executable, such as a specific version of 'dotnet.exe'/'dotnet' or the .NET Code is hosted by a native application. This snippet is for console applications.",
+    "comment": [
+      "'coreclr' is the name of the debugger 'type', and should not be localized",
+      "{Locked='(coreclr)'}"
+    ]
+  },
+  "debuggers.coreclr.configurationSnippets.description.web-local": {
+    "message": "This snippet is used to launch a new process under the .NET debugger (coreclr), specifying the path to the executable to launch. In most cases, the \".NET: Launch C# project\" snippet is a better choice. This snippet is useful when the project was built outside this VS Code instance or you want to host your .NET Code in a custom executable, such as a specific version of 'dotnet.exe'/'dotnet' or the .NET Code is hosted by a native application. This snippet is for web (ASP.NET Core) applications.",
+    "comment": [
+      "'coreclr' is the name of the debugger 'type', and should not be localized",
+      "{Locked='(coreclr)'}"
+    ]
+  },
+  "debuggers.coreclr.configurationSnippets.description.attach": {
+    "message": "Attach the .NET debugger (coreclr) to a running process. This can also be done using the 'Attach to a .NET 5+ or .NET Core process' command.",
+    "comment": [
+      "'coreclr' is the name of the debugger 'type', and should not be localized",
+      "{Locked='(coreclr)'}"
+    ]
+  },
+  "debuggers.coreclr.configurationSnippets.description.remote": "This snippet shows how to remote debug .NET Code **without** using VS Code remoting. It should be used in cases where you want to build your project locally but run it on another computer.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": {
+    "message": "This snippet is used to launch a new process under the Blazor WebAssembly debugger (blazorwasm), specifying the path to the executable to launch. In most cases, the \".NET: Launch C# project\" snippet is a better choice, but this snippet can be used to have full control over all launch options. This snippet is for hosted Blazor projects, which is a project that has a backend ASP.NET Core app to serve its files.",
+    "comment": [
+      "'blazorwasm' is the name of the debugger 'type', and should not be localized",
+      "{Locked='(blazorwasm)'}"
+    ]
+  },
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": {
+    "message": "This snippet is used to launch a new process under the Blazor WebAssembly debugger (blazorwasm). In most cases, the \".NET: Launch C# project\" snippet is a better choice, but this snippet can be used to have full control over all launch options. This snippet is for standalone Blazor projects, which is a project that does not have a backend ASP.NET Core app to serve its files.",
+    "comment": [
+      "'blazorwasm' is the name of the debugger 'type', and should not be localized",
+      "{Locked='(blazorwasm)'}"
+    ]
+  },
   "debuggers.dotnet.launch.projectPath.description": "Path to the .csproj file.",
   "debuggers.dotnet.launch.launchConfigurationId.description": "The launch configuration id to use. Empty string will use the current active configuration.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Launch C# project",
+  "debuggers.dotnet.configurationSnippets.description": "This snippet configures VS Code to debug a C# project. Debug options (example: arguments to the executable) can be configured through the '<project-directory>/Properties/launchSettings.json' file.",
   "viewsWelcome.debug.contents": {
     "message": "[Generate C# Assets for Build and Debug](command:dotnet.generateAssets)\n\nTo learn more about launch.json, see [Configuring launch.json for C# debugging](https://aka.ms/VSCode-CS-LaunchJson).",
-    "comments": [
+    "comment": [
       "Do not translate 'command:dotnet.generateAssets' and 'https://aka.ms/VSCode-CS-LaunchJson'"
     ]
   },
   "generateOptionsSchema.program.markdownDescription": {
     "message": "Path to the application dll or .NET Core host executable to launch.\nThis property normally takes the form: `${workspaceFolder}/bin/Debug/(target-framework)/(project-name.dll)`\n\nExample: `${workspaceFolder}/bin/Debug/netcoreapp1.1/MyProject.dll`\n\nWhere:\n`(target-framework)` is the framework that the debugged project is being built for. This is normally found in the project file as the `TargetFramework` property.\n\n`(project-name.dll)` is the name of debugged project's build output dll. This is normally the same as the project file name but with a '.dll' extension.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -67,26 +139,26 @@
   "generateOptionsSchema.args.1.description": "Stringified version of command line arguments passed to the program.",
   "generateOptionsSchema.stopAtEntry.markdownDescription": {
     "message": "If true, the debugger should stop at the entry point of the target. This option defaults to `false`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.launchBrowser.description": "Describes options to launch a web browser as part of launch",
   "generateOptionsSchema.launchBrowser.enabled.description": {
     "message": "Whether web browser launch is enabled. This option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.launchBrowser.args.description": {
     "message": "The arguments to pass to the command to open the browser. This is used only if the platform-specific element (`osx`, `linux` or `windows`) doesn't specify a value for `args`. Use ${auto-detect-url} to automatically use the address the server is listening to.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.launchBrowser.osx.description": {
     "message": "OSX-specific web launch configuration options. By default, this will start the browser using `open`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -94,7 +166,7 @@
   "generateOptionsSchema.launchBrowser.osx.args.description": "The arguments to pass to the command to open the browser. Use ${auto-detect-url} to automatically use the address the server is listening to.",
   "generateOptionsSchema.launchBrowser.linux.description": {
     "message": "Linux-specific web launch configuration options. By default, this will start the browser using `xdg-open`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -102,7 +174,7 @@
   "generateOptionsSchema.launchBrowser.linux.args.description": "The arguments to pass to the command to open the browser. Use ${auto-detect-url} to automatically use the address the server is listening to.",
   "generateOptionsSchema.launchBrowser.windows.description": {
     "message": "Windows-specific web launch configuration options. By default, this will start the browser using `cmd /c start`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -111,14 +183,14 @@
   "generateOptionsSchema.env.description": "Environment variables passed to the program.",
   "generateOptionsSchema.envFile.markdownDescription": {
     "message": "Environment variables passed to the program by a file. E.g. `${workspaceFolder}/.env`",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.console.markdownDescription": "When launching console projects, indicates which console the target program should be launched into.",
   "generateOptionsSchema.console.settingsDescription": {
     "message": "**Note:** _This option is only used for the `dotnet` debug configuration type_.\n\nWhen launching console projects, indicates which console the target program should be launched into.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -127,82 +199,121 @@
   "generateOptionsSchema.console.externalTerminal.enumDescription": "External terminal that can be configured via user settings.",
   "generateOptionsSchema.externalConsole.markdownDescription": {
     "message": "Attribute `externalConsole` is deprecated, use `console` instead. This option defaults to `false`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.launchSettingsFilePath.markdownDescription": {
     "message": "The path to a launchSettings.json file. If this isn't set, the debugger will search in `{cwd}/Properties/launchSettings.json`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.launchSettingsProfile.description": "If specified, indicates the name of the profile in launchSettings.json to use. This is ignored if launchSettings.json is not found. launchSettings.json will be read from the path specified should be the 'launchSettingsFilePath' property, or {cwd}/Properties/launchSettings.json if that isn't set. If this is set to null or an empty string then launchSettings.json is ignored. If this value is not specified the first 'Project' profile will be used.",
   "generateOptionsSchema.sourceFileMap.markdownDescription": {
     "message": "Maps build-time paths to local source locations. All instances of build-time path will be replaced with the local source path.\n\nExample:\n\n`{\"<build-path>\":\"<local-source-path>\"}`",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.justMyCode.markdownDescription": "When enabled (the default), the debugger only displays and steps into user code (\"My Code\"), ignoring system code and other code that is optimized or that does not have debugging symbols. [More information](https://aka.ms/VSCode-CS-LaunchJson#just-my-code)",
   "generateOptionsSchema.requireExactSource.markdownDescription": {
     "message": "Flag to require current source code to match the pdb. This option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.enableStepFiltering.markdownDescription": {
     "message": "Flag to enable stepping over Properties and Operators. This option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.description": "Flags to determine what types of messages should be logged to the output window.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": {
     "message": "Flag to determine whether exception messages should be logged to the output window. This option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": {
     "message": "Flag to determine whether module load events should be logged to the output window. This option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.programOutput.markdownDescription": {
     "message": "Flag to determine whether program output should be logged to the output window when not using an external console. This option defaults to `true`.",
-    "comments": [
-      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
-    ]
-  },
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": {
-    "message": "Flag to determine whether diagnostic engine logs should be logged to the output window. This option defaults to `false`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": {
     "message": "Flag to determine if stdout text from the launching the web browser should be logged to the output window. This option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.elapsedTiming.markdownDescription": {
-    "message": "If true, engine logging will include `adapterElapsedTime` and `engineElapsedTime` properties to indicate the amount of time, in microseconds, that a request took. This option defaults to `false`.",
-    "comments": [
+    "message": "If true, protocol message logging will include `adapterElapsedTime` and `engineElapsedTime` properties to indicate the amount of time, in microseconds, that a request took. This option defaults to `false`.",
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.threadExit.markdownDescription": {
     "message": "Controls if a message is logged when a thread in the target process exits. This option defaults to `false`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.logging.processExit.markdownDescription": {
     "message": "Controls if a message is logged when the target process exits, or debugging is stopped. This option defaults to `true`.",
-    "comments": [
+    "comment": [
+      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+    ]
+  },
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "The setting 'logging.engineLogging' has been deprecated in favor of 'logging.diagnosticsLog.protocolMessages'.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Settings to control which messages are printed to the output window from the debugger's diagnostics log. This log is meant to help troubleshoot problems with the debugger.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": {
+    "message": "Flag to determine whether DAP protocol messages exchanged between the C# debugger and the UI should be logged to the output window. This option defaults to `false`.",
+    "comment": [
+      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+    ]
+  },
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": {
+    "message": "Controls which messages are printed to the output window from the debugger's dispatcher. If not specified, this will default to `none` unless one of the verbose log settings are enabled (`debugEngineAPITracing`, `debugRuntimeEventTracing`, `expressionEvaluationTracing` or `startDebuggingTracing`), in which case the default changes to `normal`.",
+    "comment": [
+      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+    ]
+  },
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Do not print additional diagnostic messages.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Print error-level diagnostic messages.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Print important diagnostic messages.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Print all non-verbose diagnostic messages.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": {
+    "message": "Controls if API calls to Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h should be printed to the output window. This option defaults to `none`.",
+    "comment": [
+      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+    ]
+  },
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Disable tracing API calls",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Print failures from debugger API calls.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Print all debugger API calls. This is very verbose.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": {
+    "message": "Flag to determine whether verbose tracing for events raised by the underlying runtime should be enabled. This option defaults to `false`.",
+    "comment": [
+      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+    ]
+  },
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": {
+    "message": "Flag to determine whether verbose tracing for expression evaluation should be enabled. This option defaults to `false`.",
+    "comment": [
+      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+    ]
+  },
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": {
+    "message": "Flag to determine whether verbose tracing for start debugging should be enabled. This option defaults to `false`.",
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -239,20 +350,23 @@
   "generateOptionsSchema.symbolOptions.description": "Options to control how symbols (.pdb files) are found and loaded.",
   "generateOptionsSchema.symbolOptions.searchPaths.description": {
     "message": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
-    "comments": [
-      "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL."
+    "comment": [
+      "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL.",
+      "{Locked='http\u200b://MyExampleSymbolServer'}"
     ]
   },
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": {
     "message": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
-    "comments": [
-      "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL."
+    "comment": [
+      "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL.",
+      "{Locked='(https\u200b://msdl.microsoft.com\u200b/download/symbols)'}"
     ]
   },
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": {
     "message": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
-    "comments": [
-      "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL."
+    "comment": [
+      "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL.",
+      "{Locked='(https\u200b://symbols.nuget.org\u200b/download/symbols)'}"
     ]
   },
   "generateOptionsSchema.symbolOptions.cachePath.description": "Directory where symbols downloaded from symbol servers should be cached. If unspecified, on Windows the debugger will default to %TEMP%\\SymbolCache, and on Linux and macOS the debugger will default to ~/.dotnet/symbolcache.",
@@ -266,7 +380,7 @@
   "generateOptionsSchema.sourceLinkOptions.markdownDescription": "Options to control how Source Link connects to web servers. [More information](https://aka.ms/VSCode-CS-LaunchJson#source-link-options)",
   "generateOptionsSchema.sourceLinkOptions.additionalItems.enabled.markdownDescription": {
     "message": "Is Source Link enabled for this URL? If unspecified, this option defaults to `true`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
@@ -274,31 +388,31 @@
   "generateOptionsSchema.targetOutputLogPath.description": "When set, text that the target application writes to stdout and stderr (ex: Console.WriteLine) will be saved to the specified file. This option is ignored if console is set to something other than internalConsole. E.g. '${workspaceFolder}/out.txt'",
   "generateOptionsSchema.targetArchitecture.markdownDescription": {
     "message": "[Only supported in local macOS debugging]\n\nThe architecture of the debuggee. This will automatically be detected unless this parameter is set. Allowed values are `x86_64` or `arm64`.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.checkForDevCert.description": {
     "message": "If you are launching a web project on Windows or macOS and this is enabled, the debugger will check if the computer has a self-signed HTTPS certificate used to develop web servers running on https endpoints. If unspecified, defaults to true when `serverReadyAction` is set. This option does nothing on Linux, VS Code remote, and VS Code Web UI scenarios. If the HTTPS certificate is not found or isn't trusted, the user will be prompted to install/trust it.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.processName.markdownDescription": {
     "message": "The process name to attach to. If this is used, `processId` should not be used.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.processId.0.markdownDescription": {
     "message": "The process id to attach to. Use \"\" to get a list of running processes to attach to. If `processId` used, `processName` should not be used.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
   "generateOptionsSchema.processId.1.markdownDescription": {
     "message": "The process id to attach to. Use \"\" to get a list of running processes to attach to. If `processId` used, `processName` should not be used.",
-    "comments": [
+    "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   }
diff --git a/package.nls.ko.json b/package.nls.ko.json
index a2c8a82ec..12e7ee145 100644
--- a/package.nls.ko.json
+++ b/package.nls.ko.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": ".NET 5+ 또는 .NET Core 프로세스에 연결",
+  "command.csharp.downloadDebugger": ".NET Core 디버거 다운로드",
+  "command.csharp.listProcess": "연결 프로세스 나열",
+  "command.csharp.listRemoteDockerProcess": "Docker 연결에 프로세스 나열",
+  "command.csharp.listRemoteProcess": "첨부할 원격 연결의 프로세스 나열",
+  "command.csharp.reportIssue": "문제 신고",
+  "command.csharp.showDecompilationTerms": "디컴파일러 계약 표시",
+  "command.dotnet.generateAssets.currentProject": "빌드 및 디버그에 대한 자산 생성",
+  "command.dotnet.openSolution": "솔루션 열기",
+  "command.dotnet.restartServer": "언어 서버 다시 시작",
+  "command.dotnet.restore.all": "모든 프로젝트 복원",
+  "command.dotnet.restore.project": "프로젝트 복원",
+  "command.dotnet.test.debugTestsInContext": "컨텍스트에서 테스트 디버그",
+  "command.dotnet.test.runTestsInContext": "컨텍스트에서 테스트 실행",
+  "command.extension.showRazorCSharpWindow": "Razor CSharp 표시",
+  "command.extension.showRazorHtmlWindow": "Razor Html 표시",
+  "command.o.fixAll.document": "문서 내에서 발생하는 모든 코드 문제 해결",
+  "command.o.fixAll.project": "프로젝트 내에서 발생하는 모든 코드 문제 해결",
+  "command.o.fixAll.solution": "솔루션 내에서 발생하는 모든 코드 문제 해결",
+  "command.o.pickProjectAndStart": "프로젝트 선택",
+  "command.o.reanalyze.allProjects": "모든 프로젝트 분석",
+  "command.o.reanalyze.currentProject": "현재 프로젝트 분석",
+  "command.o.restart": "OmniSharp 다시 시작",
+  "command.razor.reportIssue": "Razor 문제 보고",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "암시적 개체 만들기에 대한 힌트 표시",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "유추된 형식의 변수에 대한 힌트 표시",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "인덱서에 대한 힌트 표시",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "람다 매개 변수 형식에 대한 힌트 표시",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "인라인 유형 힌트 표시",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "다음을 위해 백그라운드 코드 분석을 실행합니다.",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "다음에 대한 백그라운드 코드 분석 실행: (이전의 `omnisharp.enableRoslynAnalyzers`)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "전체 솔루션",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "없음",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "열린 문서",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "전체 솔루션",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "없음",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "열린 문서",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "CodeLens 참조를 표시할지 여부를 지정합니다.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "실행 및 디버그 테스트 CodeLens를 표시할지 여부를 지정합니다.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "참조 CodeLens를 표시해야 하는지 여부를 지정합니다(이전 `csharp.referencesCodeLens.enabled`).",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "실행 및 디버그 테스트 CodeLens를 표시해야 하는지 여부를 지정합니다(이전 `csharp.testsCodeLens.enabled`).",
   "configuration.dotnet.completion.provideRegexCompletions": "완성 목록에 정규식을 표시합니다.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "완성 목록에 중요하지 않은 형식 및 중요하지 않은 확장 메서드를 표시하도록 지원합니다. 커밋되면 적절한 using 지시문이 현재 파일의 맨 위에 추가됩니다.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "완성 목록에 가져오지 않은 유형과 가져오지 않은 확장 메서드를 표시하기 위한 지원을 활성화합니다. 커밋되면 적절한 using 지시문이 현재 파일의 맨 위에 추가됩니다(이전 `omnisharp.enableImportCompletion`).",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "최근에 선택한 멤버에 대해 자동 개체 이름 완성을 수행합니다.",
-  "configuration.dotnet.defaultSolution.description": "작업 영역에서 열 기본 솔루션의 경로입니다. 건너뛰려면 '사용 안 함'으로 설정하세요.",
+  "configuration.dotnet.defaultSolution.description": "작업 영역에서 열릴 기본 솔루션의 경로, 건너뛰려면 '비활성화'로 설정하세요(이전 `omnisharp.defaultLaunchSolution`).",
   "configuration.dotnet.dotnetPath": "기본 시스템 대신 사용할 dotnet 설치 디렉터리를 지정합니다. 이는 언어 서버 자체를 호스팅하는 데 사용할 dotnet 설치에만 영향을 줍니다(예: \"/home/username/mycustomdotnetdirectory\").",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "커서 아래에서 관련 JSON 구성 요소를 강조 표시합니다.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "커서 아래의 관련 정규식 구성 요소를 강조 표시합니다.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "인수가 매개 변수 이름과 일치하는 경우 힌트 표시 안 함",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "매개 변수 이름이 메서드의 의도와 일치하는 경우 힌트 표시 안 함",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "디컴파일된 원본 탐색을 사용하도록 설정합니다.",
+  "configuration.dotnet.preferCSharpExtension": "프로젝트가 C# 확장으로만 로드되도록 합니다.  C# 개발 키트에서 지원되지 않는 레거시 프로젝트 형식을 사용할 때 유용할 수 있습니다(창 다시 로드 필요).",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "기호를 표시할 때 설명 정보를 표시합니다.",
+  "configuration.dotnet.server.crashDumpPath": "언어 서버가 충돌하는 경우 크래시 덤프가 기록되는 폴더 경로를 설정합니다.  사용자가 쓸 수 있어야 합니다.",
   "configuration.dotnet.server.extensionPaths": "언어 서버 --extension 인수 경로에 대한 재정의",
-  "configuration.dotnet.server.path": "서버(LSP 또는 O#) 실행 파일의 절대 경로를 지정합니다. 비워 두면 C# 확장에 고정된 버전이 사용됩니다.",
+  "configuration.dotnet.server.path": "서버(LSP 또는 O#) 실행 파일의 절대 경로를 지정합니다. 비어 있으면 C# 확장에 고정된 버전이 사용됩니다(이전 `omnisharp.path`).",
+  "configuration.dotnet.server.startTimeout": "클라이언트가 언어 서버를 시작하고 연결하기 위한 시간 제한(밀리초)을 지정합니다.",
   "configuration.dotnet.server.trace": "언어 서버의 로깅 수준을 설정합니다.",
-  "configuration.dotnet.server.waitForDebugger": "디버거를 연결할 수 있도록 서버를 시작할 때 --debug 플래그를 전달합니다.",
+  "configuration.dotnet.server.waitForDebugger": "디버거 연결을 허용하기 위해 서버를 시작할 때 --debug 플래그를 전달합니다(이전 `omnisharp.waitForDebugger`).",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "참조 어셈블리에서 기호를 검색합니다. 가져오기 추가와 같은 기호 검색이 필요한 기능에 영향을 줍니다.",
-  "configuration.dotnet.unitTestDebuggingOptions": "단위 테스트 디버깅을 시작할 때 디버거와 함께 사용할 옵션입니다.",
+  "configuration.dotnet.unitTestDebuggingOptions": "단위 테스트 디버깅을 시작할 때 디버거와 함께 사용하는 옵션입니다(이전 `csharp.unitTestDebuggingOptions`).",
   "configuration.razor.languageServer.debug": "언어 서버를 시작할 때 디버그 연결을 기다릴지 여부를 지정합니다.",
   "configuration.razor.languageServer.directory": "Razor 언어 서버 디렉터리의 경로를 재정의합니다.",
   "configuration.razor.trace": "모든 메시지 [Verbose] 또는 일부 메시지 [Messages] 출력, 완전히 [Off] 중 사용할 옵션을 지정합니다.",
   "configuration.razor.trace.messages": "Razor 확장의 일부 메시지만 기록합니다.",
   "configuration.razor.trace.off": "Razor 확장의 메시지를 기록하지 않습니다.",
   "configuration.razor.trace.verbose": "Razor 확장의 모든 메시지를 기록합니다.",
+  "debuggers.coreclr.configurationSnippets.description.attach": "실행 중인 프로세스에 .NET 디버거(coreclr)를 연결합니다. 이 작업은 'Attach to a .NET 5+ or .NET Core process' 명령을 사용하여 수행할 수도 있습니다.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "이 코드 조각은 Blazor WebAssembly 디버거(blazorwasm) 아래에서 새 프로세스를 시작하는 데 사용되며, 실행 파일의 경로를 지정합니다. 대부분의 경우 \".NET: Launch C# project\" 코드 조각이 더 나은 선택이지만, 이 코드 조각을 사용하면 모든 시작 옵션을 완전히 제어할 수 있습니다. 이 코드 조각은 파일을 처리할 백 엔드 ASP.NET Core 앱이 있는 프로젝트인 호스트된 Blazor 프로젝트용입니다.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "이 코드 조각은 Blazor WebAssembly 디버거(blazorwasm) 아래에서 새 프로세스를 시작하는 데 사용됩니다. 대부분의 경우 \".NET: Launch C# project\" 코드 조각이 더 나은 선택이지만, 이 코드 조각을 사용하면 모든 시작 옵션을 완전히 제어할 수 있습니다. 이 코드 조각은 파일을 처리할 백 엔드 ASP.NET Core 앱이 없는 프로젝트인 독립 실행형 Blazor 프로젝트용입니다.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "이 코드 조각은 .NET 디버거(coreclr) 아래에서 새 프로세스를 시작하는 데 사용되며, 시작할 실행 파일의 경로를 지정합니다. 대부분의 경우 \".NET: Launch C# project\" 코드 조각을 선택하는 것이 좋습니다. 이 코드 조각은 프로젝트가 이 VS Code 인스턴스 외부에서 작성되었거나 특정 버전의 'dotnet.exe'/'dotnet'과 같은 사용자 지정 실행 파일에서 .NET Code를 호스팅하려는 경우 또는 .NET Code가 네이티브 응용 프로그램에서 호스팅되는 경우에 유용합니다. 이 코드 조각은 콘솔 응용 프로그램용입니다.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "이 코드 조각에서는 VS Code 원격을 사용하지 **않고** .NET Code를 원격 디버그하는 방법을 보여 줍니다. 프로젝트를 로컬에서 구축하고 다른 컴퓨터에서 실행하려는 경우에 사용해야 합니다.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "이 코드 조각은 .NET 디버거(coreclr) 아래에서 새 프로세스를 시작하는 데 사용되며, 시작할 실행 파일의 경로를 지정합니다. 대부분의 경우 \".NET: Launch C# project\" 코드 조각을 선택하는 것이 좋습니다. 이 코드 조각은 프로젝트가 이 VS Code 인스턴스 외부에서 작성되었거나 특정 버전의 'dotnet.exe'/'dotnet'과 같은 사용자 지정 실행 파일에서 .NET Code를 호스팅하려는 경우 또는 .NET Code가 네이티브 응용 프로그램에서 호스팅되는 경우에 유용합니다. 이 코드 조각은 웹(ASP.NET Core) 응용 프로그램용입니다.",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: .NET 프로세스에 연결",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: 원격 디버깅 - .NET 프로세스에 연결",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: 웹 어셈블리 - 호스트된 Blazor 프로젝트 시작",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: 웹 어셈블리 - 독립 실행형 Blazor 프로젝트 시작",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: 실행 파일 시작(콘솔)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: 원격 디버깅 - 실행 파일 시작(콘솔)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: 실행 파일 시작(웹)",
+  "debuggers.dotnet.configurationSnippets.description": "이 코드 조각은 VS Code가 C# 프로젝트를 디버깅하도록 구성합니다. 디버그 옵션(예: 실행 파일에 대한 인수)은 '<project-directory>/Properties/launchSettings.json' 파일을 통해 구성할 수 있습니다.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: C# 프로젝트 시작",
   "debuggers.dotnet.launch.launchConfigurationId.description": "사용할 시작 구성 ID입니다. 빈 문자열은 현재 활성 구성을 사용합니다.",
   "debuggers.dotnet.launch.projectPath.description": ".csproj 파일의 경로입니다.",
   "generateOptionsSchema.allowFastEvaluate.description": "true(기본 상태)인 경우 디버거는 간단한 속성 및 메서드 실행을 시뮬레이션하여 더 빠른 평가를 시도합니다.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "지정된 경우 사용할 launchSettings.json의 프로필 이름을 나타냅니다. launchSettings.json이 없으면 무시됩니다. launchSettings.json은 'launchSettingsFilePath' 속성 또는 {cwd}/Properties/launchSettings.json이 설정되지 않은 경우 지정된 경로에서 읽혀집니다. 이 항목이 null 또는 빈 문자열로 설정되면 launchSettings.json이 무시됩니다. 이 값을 지정하지 않으면 첫 번째 '프로젝트' 프로필이 사용됩니다.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "웹 브라우저 실행의 stdout 텍스트를 출력 창에 기록해야 하는지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 `true`입니다.",
   "generateOptionsSchema.logging.description": "출력 창에 기록해야 하는 메시지 유형을 결정하는 플래그입니다.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "true인 경우 엔진 로깅에는 `adapterElapsedTime` 및 `engineElapsedTime` 속성이 포함되어 요청에 소요된 시간(마이크로초)을 나타냅니다. 이 옵션의 기본값은 `false`입니다.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "진단 엔진 로그를 출력 창에 기록해야 하는지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 `false`입니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "모든 디버거 API 호출을 인쇄합니다. 매우 자세한 활동입니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "디버거 API 호출에서 오류를 인쇄합니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h에 대한 API 호출을 출력 창에 인쇄해야 하는지를 제어합니다. 이 옵션은 기본적으로 'none'입니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "추적 API 호출 사용 안 함",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "기본 런타임에 의해 발생한 이벤트에 대한 자세한 정보 추적을 사용하도록 설정해야 하는지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 'false'입니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "디버거의 진단 로그에서 출력 창으로 인쇄되는 메시지를 제어하는 설정입니다. 이 로그는 디버거 문제를 해결하는 데 도움이 됩니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "오류 수준 진단 메시지를 인쇄합니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "중요한 진단 메시지를 인쇄합니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "디버거의 디스패처에서 출력 창으로 인쇄되는 메시지를 제어합니다. 지정하지 않으면 자세한 로그 설정 중 하나('debugEngineAPITracing', 'debugRuntimeEventTracing', 'expressionEvaluationTracing' 또는 'startDebuggingTracing')를 사용하도록 설정하지 않는 한 기본값은 'none'으로 설정됩니다. 이 경우 기본값은 'normal'으로 변경됩니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "추가 진단 메시지를 인쇄하지 마세요.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "자세한 정보가 아닌 진단 메시지를 모두 인쇄합니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "식 평가에 대한 자세한 정보 추적을 사용할지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 `false`입니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "C# 디버거와 UI 간에 교환된 DAP 프로토콜 메시지를 출력 창에 기록해야 하는지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 'false'입니다.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "시작 디버깅에 대한 자세한 정보 추적을 사용할지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 'false'입니다.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "true인 경우 프로토콜 메시지 로깅에는 `adapterElapsedTime` 및 `engineElapsedTime` 속성이 포함되어 요청에 소요된 시간(마이크로초)을 나타냅니다. 이 옵션의 기본값은 `false`입니다.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "'logging.engineLogging' 설정은 'logging.diagnosticsLog.protocolMessages'에 대해 더 이상 사용되지 않습니다.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "예외 메시지를 출력 창에 기록해야 하는지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 `true`입니다.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "모듈 로드 이벤트를 출력 창에 기록해야 하는지 여부를 결정하는 플래그입니다. 이 옵션의 기본값은 `true`입니다.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "대상 프로세스가 종료되거나 디버깅이 중지될 때 메시지를 기록할지 여부를 제어합니다. 이 옵션의 기본값은 `true`입니다.",
@@ -137,8 +193,8 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "모듈이 'excludedModules' 배열에 있지 않으면 모든 모듈에 대한 기호를 로드합니다.",
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "'includedModules' 배열에 있거나 'includeSymbolsNextToModules' 설정을 통해 포함되는 경우가 아니면 모듈에 대한 기호를 로드하지 않도록 합니다.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "'true'인 경우 Microsoft 기호 서버(https​://msdl.microsoft.com​/download/symbols)가 기호 검색 경로에 추가됩니다. 지정하지 않으면 이 옵션의 기본값은 'false'입니다.",
-  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "'true'이면 NuGet.org 기호 서버(https://symbols.nuget.org/download/symbols)가 기호 검색 경로에 추가됩니다. 지정하지 않으면 이 옵션의 기본값은 'false'입니다.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": ".pdb 파일을 검색하는 기호 서버 URL(예: http​://MyExampleSymbolServer) 또는 디렉터리(예: /build/symbols)의 배열입니다. 이러한 디렉터리가 모듈 및 pdb가 원래 삭제된 경로 옆에 있는 기본 위치 외에 검색됩니다.",
+  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "'true'이면 NuGet.org 기호 서버(https​://symbols.nuget.org​/download/symbols)가 기호 검색 경로에 추가됩니다. 지정하지 않으면 이 옵션의 기본값은 'false'입니다.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": ".pdb 파일을 검색하는 기호 서버 URL(example: http​://MyExampleSymbolServer) 또는 디렉터리(example: /build/symbols)의 배열입니다. 이러한 디렉터리가 모듈 및 pdb가 원래 삭제된 경로 옆에 있는 기본 위치 외에 검색됩니다.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[로컬 macOS 디버깅에서만 지원됨]\r\n\r\n디버기의 아키텍처. 이 매개 변수를 설정하지 않으면 자동으로 검색됩니다. 허용되는 값은 `x86_64` 또는 `arm64`입니다.",
   "generateOptionsSchema.targetOutputLogPath.description": "설정하면 대상 애플리케이션이 stdout 및 stderr(예: Console.WriteLine)에 쓰는 텍스트가 지정된 파일에 저장됩니다. 콘솔이 internalConsole 이외의 것으로 설정된 경우 이 옵션은 무시됩니다(예: '${workspaceFolder}/out.txt')",
   "viewsWelcome.debug.contents": "[빌드와 디버그를 위한 C# 자산 생성](command:dotnet.generateAssets)\r\n\r\nlaunch.json에 관해 자세히 알아보려면 [C# 디버깅을 위한 launch.json 구성](https://aka.ms/VSCode-CS-LaunchJson)을 참조하세요."
diff --git a/package.nls.pl.json b/package.nls.pl.json
index a3322a54f..eae3470b2 100644
--- a/package.nls.pl.json
+++ b/package.nls.pl.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Dołączanie do procesu platformy .NET 5 lub .NET Core",
+  "command.csharp.downloadDebugger": "Pobierz debuger platformy .NET Core",
+  "command.csharp.listProcess": "Wyświetl proces do dołączenia",
+  "command.csharp.listRemoteDockerProcess": "Wyświetl listę procesów w połączeniu platformy Docker",
+  "command.csharp.listRemoteProcess": "Wyświetl listę procesów w połączeniu zdalnym do dołączenia",
+  "command.csharp.reportIssue": "Zgłoś problem",
+  "command.csharp.showDecompilationTerms": "Pokaż umowę warunków dekompilowania",
+  "command.dotnet.generateAssets.currentProject": "Generuj zasoby na potrzeby kompilacji i debugowania",
+  "command.dotnet.openSolution": "Otwórz rozwiązanie",
+  "command.dotnet.restartServer": "Ponownie uruchom serwer języka",
+  "command.dotnet.restore.all": "Przywróć wszystkie projekty",
+  "command.dotnet.restore.project": "Przywróć projekt",
+  "command.dotnet.test.debugTestsInContext": "Debuguj testy w kontekście",
+  "command.dotnet.test.runTestsInContext": "Uruchom testy w kontekście",
+  "command.extension.showRazorCSharpWindow": "Pokaż Razor CSharp",
+  "command.extension.showRazorHtmlWindow": "Pokaż kod Html Razor",
+  "command.o.fixAll.document": "Rozwiąż wszystkie wystąpienia problemu z kodem w dokumencie",
+  "command.o.fixAll.project": "Rozwiąż wszystkie wystąpienia problemu z kodem w projekcie",
+  "command.o.fixAll.solution": "Rozwiąż wszystkie wystąpienia problemu z kodem w rozwiązaniu",
+  "command.o.pickProjectAndStart": "Wybierz projekt",
+  "command.o.reanalyze.allProjects": "Analizuj wszystkie projekty",
+  "command.o.reanalyze.currentProject": "Analizuj bieżący projekt",
+  "command.o.restart": "Uruchom ponownie aplikację OmniSharp",
+  "command.razor.reportIssue": "Zgłoś problem z aparatem Razor",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Pokazuj wskazówki dotyczące niejawnego tworzenia obiektów",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Pokaż wskazówki dla zmiennych z wnioskowanymi typami",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Pokaż wskazówki dla indeksatorów",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Pokaż wskazówki dla typów parametrów funkcji lambda",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Wyświetl wskazówki w tekście dla typów",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Uruchom analizę kodu w tle dla:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Uruchom analizę kodu w tle dla: (Wcześniej „omnisharp.enableRoslynAnalyzers”)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Całe rozwiązanie",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Brak",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Otwórz dokumenty",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Całe rozwiązanie",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Brak",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Otwórz dokumenty",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Określa, czy mają być wyświetlane odwołania CodeLens.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Określa, czy mają być wyświetlane parametry CodeLens testu przebiegu i debugowania.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Określa, czy ma być wyświetlana funkcja CodeLens odwołań. (Wcześniej „csharp.referencesCodeLens.enabled”)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Określa, czy ma być wyświetlana funkcja CodeLens testu przebiegu i debugowania. (Wcześniej „csharp.testsCodeLens.enabled”)",
   "configuration.dotnet.completion.provideRegexCompletions": "Pokaż wyrażenia regularne na liście uzupełniania.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Umożliwia wyświetlanie niezaimportowanych typów i niezaimportowanych metod rozszerzeń na listach uzupełniania. Po zadeklarowaniu odpowiednia dyrektywa using zostanie dodana w górnej części bieżącego pliku.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Zapewnia obsługę wyświetlania niezaimportowanych typów i niezaimportowanych metod rozszerzeń na listach uzupełniania. Po zadeklarowaniu odpowiednia dyrektywa using zostanie dodana w górnej części bieżącego pliku. (Wcześniej „omnisharp.enableImportCompletion”)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Wykonaj automatyczne uzupełnianie nazw obiektów dla elementów członkowskich, które zostały ostatnio wybrane.",
-  "configuration.dotnet.defaultSolution.description": "Ścieżka domyślnego rozwiązania, które ma być otwarte w obszarze roboczym, lub ustawione na „wyłączony”, aby je pominąć.",
+  "configuration.dotnet.defaultSolution.description": "Ścieżka domyślnego rozwiązania, która ma zostać otwarta w obszarze roboczym, lub ustawiona na wartość „wyłącz”, aby je pominąć. (Poprzednio „omnisharp.defaultLaunchSolution”)",
   "configuration.dotnet.dotnetPath": "Określa ścieżkę do katalogu instalacyjnego dotnet, który ma być używany zamiast domyślnego katalogu systemowego. Ma to wpływ tylko na instalację dotnet używaną do hostowania samego serwera językowego. Przykład: „/home/username/mycustomdotnetdirectory”.",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Wyróżnij powiązane składniki JSON pod kursorem.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Wyróżnij powiązane składniki wyrażenia regularnego pod kursorem.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Pomiń wskazówki, gdy argument pasuje do nazwy parametru",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Pomiń wskazówki, gdy nazwa parametru pasuje do intencji metody",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Włącz nawigację do zdekompilowanych źródeł.",
+  "configuration.dotnet.preferCSharpExtension": "Wymusza ładowanie projektów tylko z rozszerzeniem języka C#.  Może to być przydatne w przypadku korzystania ze starszych typów projektów, które nie są obsługiwane przez zestaw C# Dev Kit. (Wymaga ponownego załadowania okna)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Pokaż informacje o uwagach podczas wyświetlania symbolu.",
+  "configuration.dotnet.server.crashDumpPath": "Ustawia ścieżkę folderu, w której są zapisywane zrzuty awaryjne w przypadku awarii serwera języka.  Użytkownik musi mieć możliwość zapisu.",
   "configuration.dotnet.server.extensionPaths": "Przesłoń ścieżkę do serwera językowego --argumenty rozszerzenia",
-  "configuration.dotnet.server.path": "Określa ścieżkę bezwzględną do pliku wykonywalnego serwera (LSP lub O#). W przypadku pozostawienia tej wartości pustej, używana jest wersja przypięta do rozszerzenia języka C#.",
+  "configuration.dotnet.server.path": "Określa ścieżkę bezwzględną do pliku wykonywalnego serwera (LSP lub O#). W przypadku pozostawienia tej wartości pustej, używana jest wersja przypięta do rozszerzenia języka C#. (Wcześniej „omnisharp.path”)",
+  "configuration.dotnet.server.startTimeout": "Określa limit czasu (w ms) dla pomyślnego uruchomienia klienta i nawiązania połączenia z serwerem języka.",
   "configuration.dotnet.server.trace": "Ustawia poziom rejestrowania dla serwera języka",
-  "configuration.dotnet.server.waitForDebugger": "Przekazuje flagę --debug podczas uruchamiania serwera, aby umożliwić dołączenie debugera.",
+  "configuration.dotnet.server.waitForDebugger": "Przekazuje flagę --debug podczas uruchamiania serwera, aby umożliwić dołączenie debugera. (Wcześniej „omnisharp.waitForDebugger”)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Wyszukaj symbole w zestawach odwołań. Ma to wpływ na funkcje wymagające wyszukiwania symboli, takie jak dodawanie importów.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Opcje używane z debugerem podczas uruchamiania na potrzeby debugowania testów jednostkowych.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Opcje używane z debugerem podczas uruchamiania na potrzeby debugowania testów jednostkowych. (Wcześniej „csharp.unitTestDebuggingOptions”)",
   "configuration.razor.languageServer.debug": "Określa, czy czekać na dołączenie debugowania podczas uruchamiania serwera języka.",
   "configuration.razor.languageServer.directory": "Przesłania ścieżkę do katalogu serwera języka Razor.",
   "configuration.razor.trace": "Określa, czy mają być przekazywane wszystkie komunikaty [Pełne], niektóre komunikaty [Komunikaty], czy żadne komunikaty [Wyłączone].",
   "configuration.razor.trace.messages": "Rejestruje tylko niektóre komunikaty z rozszerzenia Razor",
   "configuration.razor.trace.off": "Nie rejestruje komunikatów z rozszerzenia Razor",
   "configuration.razor.trace.verbose": "Rejestruje wszystkie komunikaty z rozszerzenia Razor",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Dołącz debuger platformy .NET (coreclr) do uruchomionego procesu. Można to również zrobić za pomocą polecenia „Dołącz do procesu .NET 5+ lub .NET Core”.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Ten fragment kodu służy do uruchamiania nowego procesu w debugerze zestawu WebAssembly platformy Blazor (blazorwasm), określając ścieżkę do pliku wykonywalnego do uruchomienia. W większości przypadków „.NET: Fragment kodu „Launch C# project” (Uruchom projekt C#) jest lepszym wyborem, ale za pomocą tego fragmentu kodu można mieć pełną kontrolę nad wszystkimi opcjami uruchamiania. Ten fragment kodu jest przeznaczony dla hostowanych projektów Platformy Blazor, czyli projektu, który ma zaplecze ASP.NET aplikacji Core do obsługi plików.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Ten fragment kodu służy do uruchamiania nowego procesu w debugerze zestawu WebAssembly platformy Blazor (blazorwasm). W większości przypadków „.NET: Fragment kodu „Launch C# project” (Uruchom projekt C#) jest lepszym wyborem, ale za pomocą tego fragmentu kodu można mieć pełną kontrolę nad wszystkimi opcjami uruchamiania. Ten fragment kodu jest przeznaczony dla autonomicznych projektów Platformy Blazor, będących projektem, który nie ma aplikacji zaplecza ASP.NET Core do obsługi plików.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Ten fragment kodu służy do uruchamiania nowego procesu w debugerze .NET (coreclr), określając ścieżkę do pliku wykonywalnego do uruchomienia. W większości przypadków „.NET: Fragment kodu „Launch C# project” (Uruchom projekt C#) jest lepszym wyborem. Ten fragment kodu jest przydatny, gdy projekt został skompilowany poza tym wystąpieniem programu VS Code lub chcesz hostować kod .NET w niestandardowym pliku wykonywalnym, takim jak określona wersja pliku „dotnet.exe”/„dotnet” lub program .NET Code jest hostowany przez aplikację natywną. Ten fragment kodu jest przeznaczony dla aplikacji konsolowych.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Ten fragment kodu pokazuje, jak zdalnie debugować kod .NET **bez** przy użyciu komunikacji zdalnej programu VS Code. Powinien być używany w przypadkach, gdy chcesz skompilować projekt lokalnie, ale chcesz uruchomić go na innym komputerze.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Ten fragment kodu służy do uruchamiania nowego procesu w debugerze .NET (coreclr), określając ścieżkę do pliku wykonywalnego do uruchomienia. W większości przypadków „.NET: Fragment kodu „Launch C# project” (Uruchom projekt C#) jest lepszym wyborem. Ten fragment kodu jest przydatny, gdy projekt został skompilowany poza tym wystąpieniem programu VS Code lub chcesz hostować kod .NET w niestandardowym pliku wykonywalnym, takim jak określona wersja pliku „dotnet.exe”/„dotnet” lub program .NET Code jest hostowany przez aplikację natywną. Ten fragment kodu jest przeznaczony dla aplikacji internetowych (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Dołącz do procesu platformy .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Zdalne debugowanie — dołącz do procesu platformy .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Zestaw sieci Web — uruchom hostowany projekt Platformy Blazor",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Zestaw sieci Web — uruchom autonomiczny projekt Platformy Blazor",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Uruchom plik wykonywalny (konsola)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Zdalne debugowanie — uruchamianie pliku wykonywalnego (konsola)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Uruchom plik wykonywalny (sieć Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Ten fragment kodu konfiguruje program VS Code do debugowania projektu języka C#. Opcje debugowania (przykład: argumenty pliku wykonywalnego) można skonfigurować za pomocą pliku „<project-directory>/Properties/launchSettings.json”.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Uruchom projekt języka C#",
   "debuggers.dotnet.launch.launchConfigurationId.description": "Identyfikator konfiguracji uruchamiania do użycia. Pusty ciąg znaków spowoduje użycie bieżącej aktywnej konfiguracji.",
   "debuggers.dotnet.launch.projectPath.description": "Ścieżka do pliku .csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "W przypadku wartości true (stan domyślny) debuger podejmie próbę szybszego obliczania, symulując wykonywanie prostych właściwości i metod.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Jeśli ta wartość jest określona, wskazuje nazwę profilu w pliku launchSettings.json do użycia. Jest to ignorowane, jeśli nie znaleziono pliku launchSettings.json. Plik launchSettings.json będzie odczytywany z określonej ścieżki, która powinna być właściwością „launchSettingsFilePath”, lub {cwd}/Properties/launchSettings.json, jeśli nie jest ustawiona. Jeśli ta opcja jest ustawiona na wartość null lub jest pustym ciągiem, wtedy plik launchSettings.json jest ignorowany. Jeśli ta wartość nie zostanie określona, zostanie użyty pierwszy profil „Project”.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Flaga umożliwiająca określenie, czy tekst stdout z uruchamiania przeglądarki internetowej powinien być rejestrowany w oknie danych wyjściowych. Ta opcja jest ustawiona domyślnie na wartość „true”.",
   "generateOptionsSchema.logging.description": "Flagi umożliwiające określenie, które typy komunikatów powinny być rejestrowane w oknie danych wyjściowych.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Jeśli jest ustawione na wartość true, rejestrowanie aparatu będzie zawierać właściwości „adapterElapsedTime” i „engineElapsedTime”, aby wskazać czas (w mikrosekundach) trwania żądania. Ta opcja jest ustawiona domyślnie na wartość „false”.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Flaga określająca, czy dzienniki aparatu diagnostycznego powinny być rejestrowane w oknie danych wyjściowych. Opcja jest ustawiona domyślnie na wartość „false”.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Drukuj wszystkie wywołania interfejsu API debugera. Jest to bardzo szczegółowe.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Błędy drukowania z wywołań interfejsu API debugera.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Określa, czy wywołania interfejsu API do elementu Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h powinny być drukowane w oknie danych wyjściowych. Ta opcja domyślnie ma wartość „none”.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Wyłącz wywołania interfejsu API śledzenia",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Flaga określająca, czy powinno być włączone pełne śledzenie zdarzeń wywoływanych przez bazowe środowisko uruchomieniowe. Ta opcja jest ustawiona domyślnie na wartość „false”.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Ustawienia określające, które komunikaty są drukowane w oknie danych wyjściowych z dziennika diagnostycznego debugera. Ten dziennik ma pomóc w rozwiązywaniu problemów z debugerem.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Drukuj komunikaty diagnostyczne na poziomie błędów.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Drukuj ważne komunikaty diagnostyczne.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Określa, które komunikaty są drukowane w oknie danych wyjściowych od dyspozytora debugera. Jeśli nie zostanie określona, ustawienie domyślne będzie mieć wartość „none”, chyba że jest włączone jedno z ustawień pełnego dziennika („debugEngineAPITracing”, „debugRuntimeEventTracing”, „expressionEvaluationTracing” lub „startDebuggingTracing”), w którym to przypadku wartość domyślna zmieni się na „normal”.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Nie drukuj dodatkowych komunikatów diagnostycznych.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Drukuj wszystkie nieszczegółowe komunikaty diagnostyczne.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Flaga określająca, czy powinno być włączone pełne śledzenie oceny wyrażenia. Ta opcja jest ustawiona domyślnie na wartość „false”.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Flaga określająca, czy komunikaty protokołu DAP wymieniane między debugerem języka C# i interfejsem użytkownika powinny być rejestrowane w oknie danych wyjściowych. Ta opcja jest ustawiona domyślnie na wartość „false”.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Flaga określająca, czy powinno być włączone pełne śledzenie uruchamiania debugowania. Ta opcja jest ustawiona domyślnie na wartość „false”.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Jeśli ma wartość true, rejestrowanie komunikatów protokołu będzie zawierać właściwości „adapterElapsedTime” i „engineElapsedTime”, aby wskazać czas, który zajęło żądanie w mikrosekundach. Ta opcja jest ustawiona domyślnie na wartość „false”.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "Ustawienie „logging.engineLogging” zostało uznane za przestarzałe na rzecz elementu „logging.diagnosticsLog.protocolMessages”.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Flaga umożliwiająca określenie, czy komunikaty o wyjątkach powinny być rejestrowane w oknie danych wyjściowych. Ta opcja jest ustawiona domyślnie na wartość „true”.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Flaga umożliwiająca określenie, czy zdarzenia ładowania modułu powinny być rejestrowane w oknie danych wyjściowych. Ta opcja jest ustawiona domyślnie na wartość „true”.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Określa, czy komunikat jest rejestrowany podczas kończenia procesu docelowego lub zatrzymywania debugowania. Ta opcja jest ustawiona domyślnie na wartość „true”.",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "Nie próbuj ładować symboli dla ŻADNEGO modułu, jeśli nie znajduje się w tablicy „includedModules” lub jest ono uwzględniane przez ustawienie „includeSymbolsNextToModules”.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "W przypadku wartości „true” serwer symboli firmy Microsoft (https​://msdl.microsoft.com​/download/symbols) zostanie dodany do ścieżki wyszukiwania symboli. Jeśli ta opcja nie zostanie określona, domyślnie zostanie wybrana wartość „false”.",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "W przypadku ustawienia na wartość „true” serwer symboli NuGet.org (https​://symbols.nuget.org​/download/symbols) zostanie dodany do ścieżki wyszukiwania symboli. Jeśli ta opcja nie zostanie określona, domyślnie zostanie ustawiona na wartość „false”.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Tablica adresów URL serwera symboli (przykład: http:​//MyExampleSymbolServer) lub katalogów (przykład:/build/Symbols) w celu wyszukania plików PDB. Te katalogi zostaną wyszukane jako uzupełnienie lokalizacji domyślnych — obok modułu i ścieżki, do której plik PDB został pierwotnie porzucony.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Tablica adresów URL serwera symboli (przykład: http​://MyExampleSymbolServer) lub katalogi (przykład: /build/symbols), aby wyszukać pliki .pdb. Te katalogi będą przeszukiwane oprócz lokalizacji domyślnych — obok modułu i ścieżki, do której pierwotnie przeniesiono plik pdb.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Obsługiwane tylko w przypadku debugowania lokalnego systemu macOS]\r\n\r\nArchitektura obiektu debugowanego. Zostanie automatycznie wykryta, chyba że ten parametr jest ustawiony. Dozwolone wartości to „x86_64” lub „arm_64”.",
   "generateOptionsSchema.targetOutputLogPath.description": "Po ustawieniu tekst, który aplikacja docelowa zapisuje w stdout i stderr (np. Console.WriteLine), zostanie zapisany w określonym pliku. Ta opcja jest ignorowana, jeśli konsola jest ustawiona na wartość inną niż internalConsole, np. \"${workspaceFolder}/out.txt\"",
   "viewsWelcome.debug.contents": "[Generuj zasoby języka C# na potrzeby kompilacji i debugowania](polecenie:dotnet.generateAssets)\r\n\r\nAby dowiedzieć się więcej o uruchamianiu pliku launch.json, zobacz [Konfigurowanie pliku launch.json na potrzeby debugowania w języku C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.pt-br.json b/package.nls.pt-br.json
index 432889085..cdf2bce62 100644
--- a/package.nls.pt-br.json
+++ b/package.nls.pt-br.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Anexar a um processo .NET 5+ ou .NET Core",
+  "command.csharp.downloadDebugger": "Baixar o Depurador .NET Core",
+  "command.csharp.listProcess": "Listar processo para anexar",
+  "command.csharp.listRemoteDockerProcess": "Listar processos na conexão Docker",
+  "command.csharp.listRemoteProcess": "Listar processos em conexão remota para anexar",
+  "command.csharp.reportIssue": "Relatar um problema",
+  "command.csharp.showDecompilationTerms": "Mostrar o contrato de termos do descompilador",
+  "command.dotnet.generateAssets.currentProject": "Gerar Ativos para Compilação e Depuração",
+  "command.dotnet.openSolution": "Abrir Solução",
+  "command.dotnet.restartServer": "Reiniciar o Servidor de Linguagem",
+  "command.dotnet.restore.all": "Restaurar Todos os Projetos",
+  "command.dotnet.restore.project": "Restaurar Projeto",
+  "command.dotnet.test.debugTestsInContext": "Testes de Depuração no Contexto",
+  "command.dotnet.test.runTestsInContext": "Executar Testes no Contexto",
+  "command.extension.showRazorCSharpWindow": "Mostrar Navalha CSharp",
+  "command.extension.showRazorHtmlWindow": "Mostrar Razor HTML",
+  "command.o.fixAll.document": "Corrigir todas as ocorrências de um problema de código no documento",
+  "command.o.fixAll.project": "Corrigir todas as ocorrências de um problema de código no projeto",
+  "command.o.fixAll.solution": "Corrigir todas as ocorrências de um problema de código na solução",
+  "command.o.pickProjectAndStart": "Selecionar Projeto",
+  "command.o.reanalyze.allProjects": "Analisar todos os projetos",
+  "command.o.reanalyze.currentProject": "Analisar o projeto atual",
+  "command.o.restart": "Reiniciar OmniSharp",
+  "command.razor.reportIssue": "Relatar um problema do Razor",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Mostrar dicas para a criação de objeto implícito",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Mostrar as dicas para as variáveis com tipos inferidos",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Mostrar dicas para indexadores",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Mostrar as dicas para os tipos de parâmetro lambda",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Exibir as dicas embutidas de tipo",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Executar análise de código em segundo plano para:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Execute a análise de código em segundo plano para: (Anteriormente `omnisharp.enableRoslynAnalyzers`)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Solução inteira",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Nenhum",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Abrir documentos",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Solução inteira",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Nenhum",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Abrir documentos",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Especifica se as referências do CodeLens devem ser mostradas.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Especifica se a execução do CodeLens e o teste de depuração devem ser mostrados.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Especifica se as referências CodeLens devem ser mostradas. (Anteriormente `csharp.referencesCodeLens.enabled`)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Especifica se o teste de execução e depuração CodeLens deve ser mostrado. (Anteriormente `csharp.testsCodeLens.enabled`)",
   "configuration.dotnet.completion.provideRegexCompletions": "Mostrar expressões regulares na lista de conclusão.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Habilita o suporte para mostrar tipos não importados e métodos de extensão não importados em listas de conclusão. Quando confirmada, a diretiva using apropriada será adicionada no topo do arquivo atual.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Habilita o suporte para mostrar tipos e métodos de extensão não importados em listas de conclusão. Quando confirmado, a diretiva using apropriada será adicionada no topo do arquivo atual. (Anteriormente `omnisharp.enableImportCompletion`)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Execute a conclusão automática do nome do objeto para os membros que você selecionou recentemente.",
-  "configuration.dotnet.defaultSolution.description": "O caminho da solução padrão a ser aberto no workspace ou definido como 'desabilitar' para ignorá-lo.",
+  "configuration.dotnet.defaultSolution.description": "O caminho da solução padrão a ser aberta no workspace ou definido como 'desabilitado' para ignorá-la. (Anteriormente `omnisharp.defaultLaunchSolution`)",
   "configuration.dotnet.dotnetPath": "Especifica o caminho para um diretório de instalação dotnet a ser usado em vez do sistema padrão. Isso influencia apenas a instalação do dotnet a ser usada para hospedar o próprio servidor de idiomas. Exemplo: \"/home/username/mycustomdotnetdirectory\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Destaque os componentes JSON relacionados sob o cursor.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Destaque os componentes de expressão regular relacionados sob o cursor.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Suprimir as dicas quando o argumento corresponder ao nome do parâmetro",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Suprimir as dicas quando o nome do parâmetro corresponder à intenção do método",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Habilite a navegação para fontes não compatíveis.",
+  "configuration.dotnet.preferCSharpExtension": "Força o carregamento dos projetos somente com a extensão C#.  Isso pode ser útil ao usar tipos de projetos herdados que não são suportados pelo C# Dev Kit. (Requer recarga da janela)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostrar informações de comentários ao exibir o símbolo.",
+  "configuration.dotnet.server.crashDumpPath": "Define um caminho de pasta onde os despejos de memória serão gravados se o servidor de idioma travar.  Deve ser gravável pelo usuário.",
   "configuration.dotnet.server.extensionPaths": "Substituir o caminho para os argumentos --extension do servidor de idiomas",
-  "configuration.dotnet.server.path": "Especifica o caminho absoluto para o executável do servidor (LSP ou O#). Quando deixado em branco, a versão fixada na extensão C# é usada.",
+  "configuration.dotnet.server.path": "Especifica o caminho absoluto para o executável do servidor (LSP ou O#). Quando deixado em branco, a versão fixada na extensão C# é usada. (Anteriormente `omnisharp.path`)",
+  "configuration.dotnet.server.startTimeout": "Especifica um tempo limite (em ms) para o cliente iniciar e conectar-se com êxito ao servidor de idioma.",
   "configuration.dotnet.server.trace": "Define o nível de log para o servidor de idiomas",
-  "configuration.dotnet.server.waitForDebugger": "Passa o sinalizador --debug ao iniciar o servidor para permitir que um depurador seja anexado.",
+  "configuration.dotnet.server.waitForDebugger": "Passa o sinalizador --debug ao iniciar o servidor para permitir que um depurador seja anexado. (Anteriormente `omnisharp.waitForDebugger`)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Pesquisar símbolos em montagens de referência. Afeta os recursos que exigem pesquisa de símbolos, como adicionar importações.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Opções a serem usadas com o depurador ao iniciar a depuração de teste de unidade.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Opções a serem usadas com o depurador ao iniciar a depuração de teste de unidade. (Anteriormente `csharp.unitTestDebuggingOptions`)",
   "configuration.razor.languageServer.debug": "Especifica se é preciso aguardar o anexo de depuração ao iniciar o servidor de linguagem.",
   "configuration.razor.languageServer.directory": "Substitui o caminho para o diretório do Servidor de Linguagem Razor.",
   "configuration.razor.trace": "Especifica se devem ser enviadas todas [Verbose], algumas [Mensagens] ou nenhuma [Desativado] mensagem.",
   "configuration.razor.trace.messages": "Registra apenas algumas mensagens da extensão do Razor",
   "configuration.razor.trace.off": "Não registra as mensagens da extensão do Razor",
   "configuration.razor.trace.verbose": "Registra todas as mensagens da extensão do Razor",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Anexe o depurador do .NET (coreclr) a um processo em execução. Isso também pode ser feito usando o comando 'Anexar a um processo do .NET 5+ ou do .NET Core'.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Esse snippet é usado para iniciar um novo processo no depurador Blazor WebAssembly (blazorwasm), especificando o caminho para o executável a ser iniciado. Na maioria dos casos, o \".NET: O snippet de inicialização do projeto C# é uma opção melhor, mas esse snippet pode ser usado para ter controle total sobre todas as opções de inicialização. Esse snippet é para projetos hospedados do Blazor, que é um projeto que tem um aplicativo ASP.NET Core de back-end para atender aos seus arquivos.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Esse snippet é usado para iniciar um novo processo no depurador Blazor WebAssembly (blazorwasm). Na maioria dos casos, o \".NET: O snippet de inicialização do projeto C# é uma opção melhor, mas esse snippet pode ser usado para ter controle total sobre todas as opções de inicialização. Esse snippet é para projetos autônomos do Blazor, que é um projeto que não tem um aplicativo ASP.NET Core de back-end para atender aos seus arquivos.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Esse snippet é usado para iniciar um novo processo no depurador do .NET (coreclr), especificando o caminho para o executável a ser iniciado. Na maioria dos casos, o \".NET: O snippet de inicialização do projeto C# é uma opção melhor. Esse snippet é útil quando o projeto foi criado fora dessa instância do VS Code ou você deseja hospedar o código .NET em um executável personalizado, como uma versão específica de 'dotnet.exe'/'dotnet' ou o .NET Code é hospedado por um aplicativo nativo. Este snippet é para aplicativos de console.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Este snippet mostra como depurar remotamente o código .NET **sem** usar a comunicação remota do VS Code. Ele deve ser usado nos casos em que você deseja compilar seu projeto localmente, mas o executa em outro computador.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Esse snippet é usado para iniciar um novo processo no depurador do .NET (coreclr), especificando o caminho para o executável a ser iniciado. Na maioria dos casos, o \".NET: O snippet de inicialização do projeto C# é uma opção melhor. Esse snippet é útil quando o projeto foi criado fora dessa instância do VS Code ou você deseja hospedar o código .NET em um executável personalizado, como uma versão específica de 'dotnet.exe'/'dotnet' ou o .NET Code é hospedado por um aplicativo nativo. Este snippet é para aplicativos Web (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Anexar a um processo do .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Depuração remota - Anexar a um processo do .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web Assembly - Iniciar projeto Blazor hospedado",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web Assembly – Iniciar projeto autônomo do Blazor",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Iniciar Arquivo executável (Console)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Depuração remota - Iniciar Arquivo executável (console)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Iniciar Arquivo executável (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Este snippet configura VS Code para depurar um projeto C#. As opções de depuração (exemplo: argumentos para o executável) podem ser configuradas por meio do arquivo '<project-directory>/Properties/launchSettings.json'.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: Iniciar projeto C#",
   "debuggers.dotnet.launch.launchConfigurationId.description": "A ID de configuração de inicialização a ser usada. A cadeia de caracteres vazia usará a configuração ativa atual.",
   "debuggers.dotnet.launch.projectPath.description": "Caminho para o arquivo .csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "Quando verdadeiro (o estado padrão), o depurador tentará uma avaliação mais rápida simulando a execução de propriedades e métodos simples.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Se especificado, indica o nome do perfil em launchSettings.json a ser usado. Isso será ignorado se launchSettings.json não for encontrado. launchSettings.json será lido a partir do caminho especificado deve ser a propriedade 'launchSettingsFilePath' ou {cwd}/Properties/launchSettings.json se isso não estiver definido. Se for definido como null ou uma cadeia de caracteres vazia, launchSettings.json será ignorado. Se este valor não for especificado, o primeiro perfil 'Projeto' será usado.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Sinalize para determinar se o texto stdout da inicialização do navegador da Web deve ser registrado na janela de saída. Esta opção é padronizada como `true`.",
   "generateOptionsSchema.logging.description": "Sinalizadores para determinar quais tipos de mensagens devem ser registrados na janela de saída.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Se verdadeiro, o registro do mecanismo incluirá as propriedades `adapterElapsedTime` e `engineElapsedTime` para indicar a quantidade de tempo, em microssegundos, que uma solicitação levou. Esta opção padrão é `false`.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Sinalize para determinar se os logs do mecanismo de diagnóstico devem ser registrados na janela de saída. Esta opção padrão é `false`.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Imprima todas as chamadas à API do depurador. Isso é muito detalhado.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Falhas de impressão de chamadas à API do depurador.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Controla se as chamadas de API para Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h devem ser impressas na janela de saída. Essa opção tem como padrão `none`.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Desabilitar chamadas de API de rastreamento",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Sinalizador para determinar se o rastreamento detalhado para eventos gerados pelo tempo de execução subjacente deve ser habilitado. Essa opção tem como padrão `false`.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Configurações para controlar quais mensagens são impressas na janela de saída do log de diagnóstico do depurador. Esse log destina-se a ajudar a solucionar problemas com o depurador.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Imprima mensagens de diagnóstico em nível de erro.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Imprima mensagens de diagnóstico importantes.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Controla quais mensagens são impressas na janela de saída do despachante do depurador. Se não for especificado, o padrão será `none`, a menos que uma das configurações de log detalhado esteja habilitada (`debugEngineAPITracing`, `debugRuntimeEventTracing`, `expressionEvaluationTracing` ou `startDebuggingTracing`), caso em que o padrão muda para `normal`.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Não imprima mensagens de diagnóstico adicionais.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Imprima todas as mensagens de diagnóstico não detalhadas.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Sinalizador para determinar se o rastreamento detalhado para avaliação de expressão deve ser habilitado. Essa opção tem como padrão `false`.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Sinalizador para determinar se as mensagens do protocolo DAP trocadas entre o depurador C# e a interface do usuário devem ser registradas na janela de saída. Essa opção tem como padrão `false`.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Sinalizador para determinar se o rastreamento detalhado para iniciar a depuração deve ser habilitado. Essa opção tem como padrão `false`.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Se for verdade, o log de mensagens de protocolo incluirá as propriedades `adapterElapsedTime` e `engineElapsedTime` para indicar a quantidade de tempo, em microssegundos, que uma solicitação levou. Essa opção tem como padrão `false`.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "A configuração 'logging.engineLogging' foi descontinuada em favor de 'logging.diagnosticsLog.protocolMessages'.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Sinalize para determinar se as mensagens de exceção devem ser registradas na janela de saída. Esta opção é padronizada como `true`.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Sinalizador para determinar se os eventos de carregamento do módulo devem ser registrados na janela de saída. Esta opção é padronizada como `true`.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Controla se uma mensagem é registrada quando o processo de destino sai ou a depuração é interrompida. Esta opção é padronizada como `true`.",
@@ -137,8 +193,8 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Carregue símbolos para todos os módulos, a menos que o módulo esteja na matriz 'excludedModules'.",
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "Não tente carregar símbolos para o módulo ANY, a menos que ele esteja na matriz 'includedModules' ou seja incluído por meio da configuração 'includeSymbolsNextToModules'.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Se for 'true', o servidor de Símbolos da Microsoft (https​://msdl.microsoft.com​/download/symbols) será adicionado ao caminho de pesquisa de símbolos. Se não for especificado, essa opção usará como padrão 'false'.",
-  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Se 'true', o servidor de símbolos NuGet.org (https://symbols.nuget.org/download/symbols) é adicionado ao caminho de pesquisa de símbolos. Se não for especificado, esta opção assume como padrão 'false'.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Matriz de URLs do servidor de símbolos (exemplo: http​://MyExampleSymbolServer) ou diretórios (exemplo: /build/symbols) para pesquisar arquivos .pdb. Esses diretórios serão pesquisados além dos locais padrão, ao lado do módulo e do caminho em que o pdb foi removido originalmente.",
+  "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Se 'true', o servidor de símbolos NuGet.org (https​://symbols.nuget.org​/download/symbols) é adicionado ao caminho de pesquisa de símbolos. Se não for especificado, esta opção assume como padrão 'false'.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Matriz de URLs de servidores de símbolos (exemplo: http​://MyExampleSymbolServer) ou diretórios (exemplo: /build/symbols) para procurar arquivos .pdb. Esses diretórios serão pesquisados além dos locais padrão -- próximos ao módulo e ao caminho onde o pdb foi originalmente descartado.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Com suporte apenas na depuração local do macOS]\r\n\r\nA arquitetura do depurado. Isso será detectado automaticamente, a menos que esse parâmetro seja definido. Os valores permitidos são `x86_64` ou `arm64`.",
   "generateOptionsSchema.targetOutputLogPath.description": "Quando definido, o texto que o aplicativo de destino grava em stdout e stderr (ex: Console.WriteLine) será salvo no arquivo especificado. Essa opção será ignorada se o console for definido como algo diferente de internalConsole. Por exemplo. '${workspaceFolder}/out.txt'",
   "viewsWelcome.debug.contents": "[Gerar ativos C# para Build e Depuração](command:dotnet.generateAssets)\r\n\r\nPara saber mais sobre launch.json, consulte [Como configurar launch.json para depuração C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.ru.json b/package.nls.ru.json
index b9af60bc7..8fa06e8a7 100644
--- a/package.nls.ru.json
+++ b/package.nls.ru.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "Присоединение к процессу .NET 5+ или .NET Core.",
+  "command.csharp.downloadDebugger": "Скачать отладчик .NET Core",
+  "command.csharp.listProcess": "Перечислить процесс для вложения",
+  "command.csharp.listRemoteDockerProcess": "Список процессов подключения к Docker",
+  "command.csharp.listRemoteProcess": "Список процессов при удаленном подключении для вложения",
+  "command.csharp.reportIssue": "Сообщить о проблеме",
+  "command.csharp.showDecompilationTerms": "Показать соглашение об условиях декомпиляции",
+  "command.dotnet.generateAssets.currentProject": "Создание ресурсов для сборки и отладки",
+  "command.dotnet.openSolution": "Открыть решение",
+  "command.dotnet.restartServer": "Перезапустить языковой сервер",
+  "command.dotnet.restore.all": "Восстановить все проекты",
+  "command.dotnet.restore.project": "Восстановить проект",
+  "command.dotnet.test.debugTestsInContext": "Отладочные тесты в контексте",
+  "command.dotnet.test.runTestsInContext": "Выполнить тесты в контексте",
+  "command.extension.showRazorCSharpWindow": "Показать CSharp Razor",
+  "command.extension.showRazorHtmlWindow": "Показать HTML Razor",
+  "command.o.fixAll.document": "Исправить все случаи возникновения проблем с кодом в документе.",
+  "command.o.fixAll.project": "Исправление всех случаев возникновения проблем с кодом в проекте.",
+  "command.o.fixAll.solution": "Исправить все случаи возникновения проблем с кодом в решении.",
+  "command.o.pickProjectAndStart": "Выбор проекта",
+  "command.o.reanalyze.allProjects": "Анализ всех проектов",
+  "command.o.reanalyze.currentProject": "Анализ текущего проекта",
+  "command.o.restart": "Перезапустить OmniSharp",
+  "command.razor.reportIssue": "Сообщить о проблеме Razor",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Показать указания для неявного создания объекта",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Отображать подсказки для переменных с выводимыми типами",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Отображать подсказки для индексаторов",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Отображать подсказки для типов лямбда-параметров",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Отображать подсказки для встроенных типов",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Выполнить анализ кода в фоновом режиме для:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Выполнить анализ кода в фоновом режиме для: (ранее — \"omnisharp.enableRoslynAnalyzers\")",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Все решение",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Нет",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Открыть документы",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Все решение",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Нет",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Открыть документы",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Указывает, следует ли отображать CodeLens ссылок.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "Указывает, следует ли отображать CodeLens тестового запуска и отладки.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "Указывает, следует ли отображать CodeLens ссылок. (Ранее — \"csharp.referencesCodeLens.enabled\")",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "Указывает, следует ли отображать CodeLens тестового запуска и отладки. (Ранее — \"csharp.testsCodeLens.enabled\")",
   "configuration.dotnet.completion.provideRegexCompletions": "Отображение регулярных выражений в списке завершения.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Включает поддержку отображения неимпортированных типов и неимпортированных методов расширения в списках завершения. При фиксации соответствующая директива использования будет добавлена в начало текущего файла.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Включает поддержку отображения неимпортированных типов и неимпортированных методов расширения в списках завершения. При фиксации соответствующая директива использования будет добавлена в начало текущего файла. (Ранее — \"omnisharp.enableImportCompletion\")",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Выполните автоматическое завершение имен объектов для выбранных элементов.",
-  "configuration.dotnet.defaultSolution.description": "Путь к решению по умолчанию, которое будет открыто в рабочей области. Или задайте значение \"Отключить\", чтобы пропустить его.",
+  "configuration.dotnet.defaultSolution.description": "Путь к решению по умолчанию, которое будет открыто в рабочей области. Или задайте значение \"Отключить\", чтобы пропустить его. (Ранее — \"omnisharp.defaultLaunchSolution\")",
   "configuration.dotnet.dotnetPath": "Указывает путь к каталогу установки dotnet для использования вместо стандартного системного каталога. Это влияет только на установку dotnet, используемую для размещения самого языкового сервера. Пример: \"/home/username/mycustomdotnetdirectory\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Выделить связанные компоненты JSON под курсором.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Выделение связанных компонентов регулярных выражений под курсором.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Скрывать подсказки, когда аргумент соответствует имени параметра",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Скрывать подсказки, если имя параметра соответствует намерению метода.",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Включить переход к декомпилированным источникам.",
+  "configuration.dotnet.preferCSharpExtension": "Принудительно загружает проекты только с расширением C#.  Это может быть полезно при использовании устаревших типов проектов, которые не поддерживаются C# Dev Kit. (Требуется перезагрузка окна)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Показывать примечания при отображении символа.",
+  "configuration.dotnet.server.crashDumpPath": "Задает путь к папке, в которую записываются аварийные дампы в случае сбоя языкового сервера.  Должен быть доступен для записи пользователем.",
   "configuration.dotnet.server.extensionPaths": "Переопределить путь к аргументам --extension сервера языка",
-  "configuration.dotnet.server.path": "Указывает абсолютный путь к исполняемому файлу сервера (LSP или O#). Если оставить поле пустым, используется версия, закрепленная в расширении C#.",
+  "configuration.dotnet.server.path": "Указывает абсолютный путь к исполняемому файлу сервера (LSP или O#). Если оставить поле пустым, используется версия, закрепленная в расширении C#. (Ранее — \"omnisharp.path\")",
+  "configuration.dotnet.server.startTimeout": "Указывает время ожидания (в миллисекундах) для запуска клиента и его подключения к языковому серверу.",
   "configuration.dotnet.server.trace": "Задает уровень ведения журнала для языкового сервера",
-  "configuration.dotnet.server.waitForDebugger": "Передает флаг --debug при запуске сервера, чтобы разрешить подключение отладчика.",
+  "configuration.dotnet.server.waitForDebugger": "Передает флаг --debug при запуске сервера, чтобы разрешить подключение отладчика. (Ранее — \"omnisharp.waitForDebugger\")",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Поиск символов в эталонных сборках. Он влияет на функции, для которых требуется поиск символов, например добавление импортов.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Параметры, которые используются с отладчиком при запуске для отладки модульных тестов.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Параметры, которые используются с отладчиком при запуске для отладки модульных тестов. (Ранее — \"csharp.unitTestDebuggingOptions\")",
   "configuration.razor.languageServer.debug": "Указывает, следует ли ожидать подключения отладки при запуске языкового сервера.",
   "configuration.razor.languageServer.directory": "Переопределяет путь к каталогу языкового сервера Razor.",
   "configuration.razor.trace": "Указывает, сколько сообщений выводить: все [Verbose], несколько [Messages] или ни одного [Off].",
   "configuration.razor.trace.messages": "Регистрирует лишь некоторые сообщения из расширения Razor",
   "configuration.razor.trace.off": "Не регистрирует сообщения из расширения Razor",
   "configuration.razor.trace.verbose": "Регистрирует все сообщения из расширения Razor",
+  "debuggers.coreclr.configurationSnippets.description.attach": "Присоедините отладчик .NET (coreclr) к запущенному процессу. Это также можно сделать с помощью команды \"Присоединение к процессу .NET 5+ или .NET Core\".",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Этот фрагмент кода используется для запуска нового процесса в отладчике Blazor WebAssembly (blazorwasm), указывая путь к исполняемому файлу для запуска. В большинстве случаев фрагмент кода \".NET: запуск проекта C#\" является более оптимальным вариантом, но этот фрагмент можно использовать для полного управления всеми параметрами запуска. Этот фрагмент кода предназначен для размещенных проектов Blazor, которые используют серверное приложение ASP.NET Core для обработки своих файлов.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Этот фрагмент кода используется для запуска нового процесса в отладчике Blazor WebAssembly (blazorwasm). В большинстве случаев фрагмент кода \".NET: запуск проекта C#\" является более оптимальным вариантом, но этот фрагмент можно использовать для полного управления всеми параметрами запуска. Этот фрагмент кода предназначен для автономных проектов Blazor, у которых нет серверного приложения ASP.NET Core для обработки своих файлов.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Этот фрагмент кода используется для запуска нового процесса в отладчике .NET (coreclr), указывая путь к исполняемому файлу для запуска. В большинстве случаев фрагмент кода \".NET: запуск проекта C#\" является более оптимальным вариантом. Этот фрагмент кода удобен, если проект был создан за пределами этого экземпляра VS Code или вы хотите разместить свой экземпляр .NET Code в пользовательском исполняемом файле, например в определенной версии \"dotnet.exe\"/\"dotnet\" или в экземпляре .NET Code, размещенном в собственном приложении. Этот фрагмент кода используется для консольных приложений.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "В этом фрагменте кода показано, как удаленно отладить код .NET **без** использования удаленного сеанса VS Code. Его следует использовать в случаях, когда сборку проекта требуется выполнить локально, но при этом запустить его на другом компьютере.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Этот фрагмент кода используется для запуска нового процесса в отладчике .NET (coreclr), указывая путь к исполняемому файлу для запуска. В большинстве случаев фрагмент кода \".NET: запуск проекта C#\" является более оптимальным вариантом. Этот фрагмент кода удобен, если проект был создан за пределами этого экземпляра VS Code или вы хотите разместить свой экземпляр .NET Code в пользовательском исполняемом файле, например в определенной версии \"dotnet.exe\"/\"dotnet\" или в экземпляре .NET Code, размещенном в собственном приложении. Этот фрагмент кода предназначен для веб-приложений (ASP.NET Core).",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: присоединение к процессу .NET",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: удаленная отладка — присоединение к процессу .NET",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: веб-сборка — запуск размещенного проекта Blazor",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: веб-сборка — запуск автономного проекта Blazor",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: запуск исполняемого файла (консоль)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: удаленная отладка — запуск исполняемого файла (консоль)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: запуск исполняемого файла (Интернет)",
+  "debuggers.dotnet.configurationSnippets.description": "Этот фрагмент кода настраивает VS Code для отладки проекта C#. Параметры отладки (например, аргументы для исполняемого файла) можно настроить с помощью файла \"<project-directory>/Properties/launchSettings.json\".",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: запуск проекта C#",
   "debuggers.dotnet.launch.launchConfigurationId.description": "Используемый идентификатор конфигурации запуска. Если оставить эту строку пустой, будет использоваться текущая активная конфигурация.",
   "debuggers.dotnet.launch.projectPath.description": "Путь к файлу .csproj.",
   "generateOptionsSchema.allowFastEvaluate.description": "Если присвоено значение true (состояние по умолчанию), отладчик попытается ускорить оценку, имитируя выполнение простых свойств и методов.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Если задано, указывает используемое имя профиля в файле launchSettings.json. Этот параметр игнорируется, если файл launchSettings.json не найден. Файл launchSettings.json будет считываться по пути, указанному свойством launchSettingsFilePath или {cwd}/Properties/launchSettings.json, если это не настроено. Если для этого параметра настроено значение NULL или пустая строка, launchSettings.json игнорируется. Если это значение не указано, будет использоваться первый профиль \"Project\".",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Флаг, определяющий, следует ли регистрировать в окне вывода текст stdout из запуска веб-браузера. По умолчанию этот параметр принимает значение true.",
   "generateOptionsSchema.logging.description": "Флаги для определения типов сообщений, регистрируемых в окне вывода.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Если применяется значение true, журнал обработчика включает свойства adapterElapsedTime и engineElapsedTime, чтобы указать время (в микросекундах), затраченное на выполнение запроса. По умолчанию этот параметр принимает значение true.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Флаг, определяющий, следует ли регистрировать журналы модуля диагностики в окне вывода. По умолчанию этот параметр принимает значение false.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Печать всех вызовов API отладчика. Это очень подробно.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Печать ошибок из вызовов API отладчика.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Определяет, должны ли вызовы API Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h выводиться в окно вывода. По умолчанию этот параметр принимает значение\"none\".",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "Отключить трассировку вызовов API",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Флажок, определяющий, следует ли включать подробную трассировку событий, вызываемых базовой средой выполнения. По умолчанию этот параметр принимает значение ИСТИНА.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Параметры для управления тем, какие сообщения выводятся в окно вывода из журнала диагностики отладчика. Этот журнал предназначен для помощи в устранении проблем с отладчиком.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Печать диагностических сообщений на уровне ошибок.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Печатать важные диагностические сообщения.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Управляет тем, какие сообщения выводятся в окно вывода из диспетчера отладчика. Если не указано, по умолчанию будет установлено значение \"none\", если не включена одна из настроек подробного журнала (\"debugEngineAPITracing\", \"debugRuntimeEventTracing\", \"expressionEvaluationTracing\" или \"startDebuggingTracing\"), и в этом случае значение по умолчанию меняется на \"normal\".",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Не печатать дополнительные диагностические сообщения.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Печать всех не подробных диагностических сообщений.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "Флажок, определяющий, следует ли включать подробную трассировку для оценки выражений. По умолчанию этот параметр принимает значение ИСТИНА.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "Флажок, определяющий, следует ли записывать в окно вывода сообщения протокола DAP, которыми обмениваются отладчик C# и пользовательский интерфейс. По умолчанию этот параметр принимает значение ИСТИНА.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Флажок, определяющий, следует ли включать подробную трассировку для начала отладки. По умолчанию этот параметр принимает значение ИСТИНА.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Если применяется значение ИСТИНА, ведение журнала протокола будет включать свойства \"adapterElapsedTime\" и \"engineElapsedTime\", чтобы указать время (в микросекундах), затраченное на выполнение запроса. По умолчанию этот параметр принимает значение ИСТИНА.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "Параметр \"logging.engineLogging\" является нерекомендуемым в пользу \"logging.diagnosticsLog.protocolMessages\".",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Флаг, определяющий, следует ли регистрировать сообщения об исключениях в окне вывода. По умолчанию этот параметр принимает значение true.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Флаг, определяющий, следует ли регистрировать события загрузки модуля в окне вывода. По умолчанию этот параметр принимает значение true.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Управляет тем, регистрируется ли сообщение при завершении целевого процесса или остановке отладки. По умолчанию этот параметр принимает значение true.",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "Не пытайтесь загрузить символы для ЛЮБОГО модуля, если он не находится в массиве \"includedModules\", или он включен с помощью параметра \"includeSymbolsNextToModules\".",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "Если значение равно \"true\", сервер символов (Майкрософт) (https​://msdl.microsoft.com​/download/symbols) добавляется к пути поиска символов. Если этот параметр не задан, по умолчанию используется значение \"false\".",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "Если применяется значение true, сервер символов NuGet.org (https​://symbols.nuget.org​/download/symbols) добавляется к пути поиска символов. Если этот параметр не настроен, по умолчанию используется значение false.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "Массив URL-адресов сервера символов (например, http​://MyExampleSymbolServer) или каталогов (например: /build/symbols) для поиска PDB-файлов. Поиск в этих каталогах осуществляется в дополнение к расположениям по умолчанию — рядом с модулем и путем первоначального удаления PDB-файла.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "Массив из URL-адресов сервера символов (example: http​://MyExampleSymbolServer) или каталогов (example: /build/symbols) для поиска PDB-файлов. Поиск будет выполняться в этих каталогах, помимо расположений по умолчанию (расположение рядом с модулем, а также путь, по которому изначально был обнаружен PDB-файл).",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Поддерживается только в локальной отладке macOS]\r\n\r\nАрхитектура отлаживаемого объекта. Будет определяться автоматически, если этот параметр не задан. Допустимые значения: \"x86_64\" или \"arm64\".",
   "generateOptionsSchema.targetOutputLogPath.description": "Если этот параметр настроен, текст, который целевое приложение записывает в stdout и stderr (например, Console.WriteLine), будет сохранен в указанном файле. Этот параметр игнорируется, если для консоли настроено значение, отличное от internalConsole. Например, \"${workspaceFolder}/out.txt\"",
   "viewsWelcome.debug.contents": "[Создание ресурсов C# для сборки и отладки](command:dotnet.generateAssets)\r\n\r\nДополнительные сведения о launch.json см. в разделе [Настройка launch.json для отладки C#](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.tr.json b/package.nls.tr.json
index 6b02ddfd6..31c091cc6 100644
--- a/package.nls.tr.json
+++ b/package.nls.tr.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": ".NET 5+ veya .NET Core işlemine ekleme",
+  "command.csharp.downloadDebugger": ".NET Core Hata Ayıklayıcısını İndirin",
+  "command.csharp.listProcess": "Ekleme işlemini listele",
+  "command.csharp.listRemoteDockerProcess": "Docker bağlantısındaki işlemleri listeleme",
+  "command.csharp.listRemoteProcess": "Eklemek için uzak bağlantıdaki işlemleri listeleyin",
+  "command.csharp.reportIssue": "Bir sorun bildirin",
+  "command.csharp.showDecompilationTerms": "Derleyici koşulları sözleşmesini göster",
+  "command.dotnet.generateAssets.currentProject": "Derleme ve Hata Ayıklama için Varlıklar Oluşturun",
+  "command.dotnet.openSolution": "Çözümü Aç",
+  "command.dotnet.restartServer": "Dil Sunucusunu Yeniden Başlat",
+  "command.dotnet.restore.all": "Tüm Projeleri Geri Yükleyin",
+  "command.dotnet.restore.project": "Projeyi Geri Yükle",
+  "command.dotnet.test.debugTestsInContext": "Bağlamda Hata Ayıklama Testleri",
+  "command.dotnet.test.runTestsInContext": "Testleri Bağlamda Çalıştırın",
+  "command.extension.showRazorCSharpWindow": "Razor CSharp'ı göster",
+  "command.extension.showRazorHtmlWindow": "Razor HTML'sini göster",
+  "command.o.fixAll.document": "Belgedeki kod sorununun tüm oluşumlarını düzeltin",
+  "command.o.fixAll.project": "Proje içindeki kod sorununun tüm oluşumlarını düzeltin",
+  "command.o.fixAll.solution": "Çözüm içindeki bir kod sorununun tüm oluşumlarını düzeltin",
+  "command.o.pickProjectAndStart": "Proje Seç",
+  "command.o.reanalyze.allProjects": "Tüm projeleri çözümleyin",
+  "command.o.reanalyze.currentProject": "Geçerli projeyi çözümle",
+  "command.o.restart": "OmniSharp'ı yeniden başlatın",
+  "command.razor.reportIssue": "Razor sorunu bildirin",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "Örtük nesne oluşturma ipuçlarını göster",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "Çıkarsanan türlere sahip değişkenler için ipuçlarını göster",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Dizin oluşturucular için ipuçlarını göster",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Lambda parametre türleri için ipuçlarını göster",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "Satır içi tür ipuçlarını göster",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Şunlar için arka plan kod analizini çalıştır:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Şunun için arka plan kodu analizini çalıştırın: (Daha önce `omnisharp.enableRoslynAnalyzers`)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Tüm çözüm",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Yok",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "Açık belgeler",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "Tüm çözüm",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "Yok",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "Açık belgeler",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "CodeLens başvurularının gösterilip gösterilmeyeceğini belirtir.",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "CodeLens testini çalıştırma ve hata ayıklamanın gösterilip gösterilmeyeceğini belirtir.",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "CodeLens referanslarının gösterilip gösterilmeyeceğini belirtir. (Daha önce 'csharp.referencesCodeLens.enabled'dı)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "CodeLens çalıştırma ve hata ayıklama testinin gösterilip gösterilmeyeceğini belirtir. (Daha önce 'csharp.testsCodeLens.enabled'dı)",
   "configuration.dotnet.completion.provideRegexCompletions": "Tamamlama listesinde normal ifadeleri göster.",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Tamamlanma listelerinde, aktarlanmamış türleri ve aktarlanmamış uzantı yöntemlerini gösterme desteği sağlar. İşlendiğinde, uygun using yönergesi geçerli dosyanın en üstüne eklenir.",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "Tamamlanma listelerinde içe aktarılmamış türleri ve içe aktarılmamış uzantı yöntemlerini göstermeye yönelik desteği etkinleştirir. Taahhüt edildiğinde, uygun kullanım yönergesi geçerli dosyanın en üstüne eklenecektir. (Önceden 'omnisharp.enableImportCompletion')",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "Yakın zamanda seçtiğiniz üyeler için otomatik nesne adı tamamlama gerçekleştirin.",
-  "configuration.dotnet.defaultSolution.description": "Çalışma alanında açılacak varsayılan çözümün yolu. Bunu atlamak için ‘Devre dışı bırak’ olarak ayarlayın.",
+  "configuration.dotnet.defaultSolution.description": "Varsayılan çözümün yolu, çalışma alanında açılacak veya atlamak için 'devre dışı' olarak ayarlanacak. (Daha önce 'omnisharp.defaultLaunchSolution')",
   "configuration.dotnet.dotnetPath": "Varsayılan sistem dizini yerine kullanılacak bir dotnet kurulum dizininin yolunu belirtir. Bu, yalnızca dil sunucusunun kendisini barındırmak için kullanılacak dotnet kurulumunu etkiler. Örnek: \"/home/username/mycustomdotnetdirectory\".",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "İmlecin altındaki ilgili JSON bileşenlerini vurgula.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "İmleç altındaki ilgili normal ifade bileşenlerini vurgula.",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "Bağımsız değişken parametre adıyla eşleştiğinde ipuçlarını bastır",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Parametre adı metodun hedefi ile eşleştiğinde ipuçlarını gizle",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "Derlenmiş kaynaklarda gezinmeyi etkinleştir.",
+  "configuration.dotnet.preferCSharpExtension": "Projeleri yalnızca C# uzantısıyla yüklenmeye zorlar.  Bu, C# Dev Kit tarafından desteklenmeyen eski proje türlerini kullanırken yararlı olabilir. (Pencerenin yeniden yüklenmesi gerekir)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Simge görüntülendiğinde açıklama bilgilerini göster.",
+  "configuration.dotnet.server.crashDumpPath": "Dil sunucusunun çökmesi durumunda kilitlenme dökümlerinin yazılacağı klasör yolunu ayarlar.  Kullanıcı tarafından yazılabilir olmalıdır.",
   "configuration.dotnet.server.extensionPaths": "Dil sunucusu --extension bağımsız değişkenleri yolunu geçersiz kıl",
-  "configuration.dotnet.server.path": "Sunucunun (LSP veya O#) yürütülebilir dosyasının mutlak yolunu belirtir. Boş bırakıldığında, C# Uzantısına sabitlenmiş sürüm kullanılır.",
+  "configuration.dotnet.server.path": "Sunucunun (LSP veya O#) yürütülebilir dosyasının mutlak yolunu belirtir. Boş bırakıldığında C# Uzantısına sabitlenen sürüm kullanılır. (Önceden 'omnisharp.path')",
+  "configuration.dotnet.server.startTimeout": "İstemcinin başarılı bir şekilde başlatılması ve dil sunucusuna bağlanması için zaman aşımını (ms cinsinden) belirtir.",
   "configuration.dotnet.server.trace": "Dil sunucusu için günlük düzeyini ayarlar",
-  "configuration.dotnet.server.waitForDebugger": "Hata ayıklayıcının ekli olması için sunucu başlatılırken --debug bayrağını geçirir.",
+  "configuration.dotnet.server.waitForDebugger": "Bir hata ayıklayıcının eklenmesine izin vermek için sunucuyu başlatırken --debug bayrağını iletir. (Önceden 'omnisharp.waitForDebugger')",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Başvuru derlemeleri içinde sembolleri arama. İçeri aktarma ekleme gibi sembol arama gerektiren özellikleri etkiler.",
-  "configuration.dotnet.unitTestDebuggingOptions": "Birim testi hata ayıklaması için başlatılırken hata ayıklayıcıyla birlikte kullanma seçenekleri.",
+  "configuration.dotnet.unitTestDebuggingOptions": "Birim testi hata ayıklamasını başlatırken hata ayıklayıcıyla birlikte kullanılacak seçenekler. (Önceden 'csharp.unitTestDebuggingOptions')",
   "configuration.razor.languageServer.debug": "Dil sunucusunu başlatırken hata ayıklama eklemesinin beklenip beklenmeyeceğini belirtir.",
   "configuration.razor.languageServer.directory": "Razor Dil Sunucusu dizininin yolunu geçersiz kılıyor.",
   "configuration.razor.trace": "Tüm mesajların [Ayrıntılı], bazı mesajların [Mesajlar] veya hiç çıkmayacağını [Kapalı] belirtir.",
   "configuration.razor.trace.messages": "Razor uzantısından yalnızca bazı iletileri günlükler",
   "configuration.razor.trace.off": "Razor uzantısından gelen iletileri günlüğe kaydetmez",
   "configuration.razor.trace.verbose": "Razor uzantısından gelen tüm mesajları günlüğe kaydeder",
+  "debuggers.coreclr.configurationSnippets.description.attach": ".NET hata ayıklayıcısını (coreclr) çalışan bir işleme ekleyin. Bu, '.NET 5+ veya .NET Core işlemine ekle' komutu kullanılarak da kullanılabilir.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Bu kod parçacığı, Blazor WebAssembly hata ayıklayıcısı (blazorwasm) altında, başlatılacak yürütülebilir dosyanın yolunu belirten yeni bir işlemi başlatmak için kullanılır. Çoğu durumda, \".NET: C# projesini başlat\" kod parçacığı daha iyi bir seçimdir, ancak bu kod parçacığı tüm başlatma seçenekleri üzerinde tam denetime sahip olmak için kullanılabilir. Bu kod parçacığı dosyalarını sunmak için arka uç ASP.NET Core uygulamasına sahip bir proje olan, barındırılan Blazor projeleri içindir.",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "Bu kod parçacığı, Blazor WebAssembly hata ayıklayıcısı (blazorwasm) altında yeni bir işlemi başlatmak için kullanılır. Çoğu durumda, \".NET: C# projesini başlat\" kod parçacığı daha iyi bir seçimdir, ancak bu kod parçacığı tüm başlatma seçenekleri üzerinde tam denetime sahip olmak için kullanılabilir. Bu kod parçacığı, dosyalarını sunmak için bir arka uç ASP.NET Core uygulamasına sahip olmayan bir proje olan tek başına Blazor projeleri içindir.",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "Bu kod parçacığı, .NET hata ayıklayıcısı (coreclr) altında, başlatılacak yürütülebilir dosyanın yolunu belirten yeni bir işlemi başlatmak için kullanılır. Çoğu durumda, \".NET: C# projesini başlat\" kod parçacığı daha iyi bir seçimdir. Bu kod parçacığı, proje bu VS Code örneğinin dışında oluşturulduğunda veya .NET Kodunuzu 'dotnet.exe'/'dotnet'in belirli bir sürümü gibi özel bir yürütülebilir dosyada barındırmak istediğinizde ya da .NET Code yerel bir uygulama tarafından barındırıldığında kullanışlıdır. Bu kod parçacığı konsol uygulamalarına yöneliktir.",
+  "debuggers.coreclr.configurationSnippets.description.remote": "Bu kod parçacığı, VS Code uzaktan iletişimi **olmadan** .NET Kodunda uzaktan hata ayıklamanın nasıl yapılacağını gösterir. Projenizi yerel olarak oluşturmak ancak başka bir bilgisayarda çalıştırmak istediğiniz durumlarda kullanılmalıdır.",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "Bu kod parçacığı, .NET hata ayıklayıcısı (coreclr) altında, başlatılacak yürütülebilir dosyanın yolunu belirten yeni bir işlemi başlatmak için kullanılır. Çoğu durumda, \".NET: C# projesini başlat\" kod parçacığı daha iyi bir seçimdir. Bu kod parçacığı, proje bu VS Code örneğinin dışında oluşturulduğunda veya .NET Kodunuzu 'dotnet.exe'/'dotnet'in belirli bir sürümü gibi özel bir yürütülebilir dosyada barındırmak istediğinizde ya da .NET Code yerel bir uygulama tarafından barındırıldığında kullanışlıdır. Bu kod parçacığı web (ASP.NET Core) uygulamalarına yöneliktir.",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: .NET işlemine ekle",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: Uzaktan hata ayıklama - .NET işlemine ekle",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web Derlemesi - Barındırılan Blazor projesini başlat",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web Derlemesi - Tek başına Blazor projesini başlat",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Yürütülebilir dosyayı başlat (Konsol)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: Uzaktan hata ayıklama - Yürütülebilir dosyayı başlat (Konsol)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Yürütülebilir dosyayı başlat (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "Bu kod parçacığı, bir C# projesinde hata ayıklamak için VS Code'u yapılandırır. Hata ayıklama seçenekleri (örnek: yürütülebilir dosyanın bağımsız değişkenleri) '<project-directory>/Properties/launchSettings.json' dosyası aracılığıyla yapılandırılabilir.",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: C# projesini başlat",
   "debuggers.dotnet.launch.launchConfigurationId.description": "Kullanılacak başlatma yapılandırma kimliği. Boş dize, geçerli etkin yapılandırmayı kullanır.",
   "debuggers.dotnet.launch.projectPath.description": ".csproj dosyasının yolu.",
   "generateOptionsSchema.allowFastEvaluate.description": "True olduğunda (varsayılan durum), hata ayıklayıcısı basit özelliklerin ve yöntemlerin yürütülmesinin simülasyonunu yaparak daha hızlı değerlendirmeyi dener.",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "Belirtilmişse kullanılacak launchSettings.json dosyasındaki profilin adını belirtir. Bu, launchSettings.json bulunamazsa yoksayılır. Belirtilen yoldan okunacak launchSettings.json 'launchSettingsFilePath' özelliği veya ayarlanmamışsa {cwd}/Properties/launchSettings.json olmalıdır. Bu, null veya boş bir dize olarak ayarlanırsa launchSettings.json yoksayılır. Bu değer belirtilmezse ilk 'Project' profili kullanılır.",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "Web tarayıcısının başlatılmasından kaynaklanan stdout metninin çıkış penceresine kaydedilip kaydedilmeyeceğini belirleyen bayrak. Bu seçenek varsayılan olarak `true` değerini alır.",
   "generateOptionsSchema.logging.description": "Çıkış penceresine ne tür iletilerin kaydedilmesi gerektiğini belirleyen bayraklar.",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "True ise altyapı günlüğü, bir isteğin sürdüğü zaman miktarını mikrosaniye cinsinden belirtmek için `adapterElapsedTime` ve `engineElapsedTime` özelliklerini içerir. Bu seçenek varsayılan olarak `false` değerini alır.",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "Tanılama altyapısı günlüklerinin çıkış penceresine kaydedilmesinin gerekli olup olmadığını belirleyen bayrak. Varsayılan olarak `false` değerini alır.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "Tüm hata ayıklayıcı API çağrılarını yazdır. Bu çok ayrıntılı.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "Hata ayıklayıcı API çağrılarından kaynaklanan yazdırma hataları.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h'ye API çağrılarının çıkış penceresine yazdırılıp yazdırılmayacağını kontrol eder. Bu seçenek varsayılan olarak `yok`tur.",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "İzleme API çağrılarını devre dışı bırak",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "Temel çalışma zamanı tarafından oluşturulan olaylar için ayrıntılı izlemenin etkinleştirilip etkinleştirilmeyeceğini belirleyen bayrak. Bu seçenek varsayılan olarak `false` değerini alır.",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "Hata ayıklayıcının tanılama günlüğünden çıkış penceresine hangi mesajların yazdırılacağını kontrol eden ayarlar. Bu günlüğün amacı hata ayıklayıcıyla ilgili sorunları gidermeye yardımcı olmaktır.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "Hata düzeyinde tanılama mesajlarını yazdırın.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "Önemli tanılama mesajlarını yazdırın.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "Hata ayıklayıcının göndericisinden hangi mesajların çıktı penceresine yazdırılacağını kontrol eder. Belirtilmezse, ayrıntılı günlük ayarlarından biri etkinleştirilmediği sürece (\"debugEngineAPITracing\", \"debugRuntimeEventTracing\", \"expressionEvaluationTracing\" veya \"startDebuggingTracing\") bu varsayılan olarak \"none\" olacaktır; bu durumda varsayılan ayar \"normal\" olarak değişir.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "Ek tanılama iletilerini yazdırma.",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "Ayrıntılı olmayan tüm tanılama mesajlarını yazdırın.",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "İfade değerlendirmesi için ayrıntılı izlemenin etkinleştirilip etkinleştirilmeyeceğini belirleyen işaret. Bu seçenek varsayılan olarak `false` değerini alır.",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "C# hata ayıklayıcısı ile kullanıcı arayüzü arasında alınıp verilen DAP protokolü mesajlarının çıkış penceresine kaydedilmesi gerekip gerekmediğini belirleyen bayrak. Bu seçenek varsayılan olarak `false` değerini alır.",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "Hata ayıklamayı başlatma için ayrıntılı izlemenin etkin olup olmadığını belirleyen bayrak. Bu seçenek varsayılan olarak `false` değerini alır.",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "Doğruysa, protokol mesajı günlüğü, bir isteğin aldığı süreyi mikrosaniye cinsinden belirtmek için \"adapterElapsedTime\" ve \"engineElapsedTime\" özelliklerini içerecektir. Bu seçenek varsayılan olarak `false` değerini alır.",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "'logging.engineLogging' ayarı, 'logging.diagnosticsLog.protocolMessages' yerine kullanımdan kaldırıldı.",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "Özel durum iletilerinin çıkış penceresine kaydedilmesinin gerekip gerekmediğini belirleyen bayrak. Varsayılan olarak `true` değerini alır.",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "Modül yükleme olaylarının çıkış penceresine kaydedilmesinin gerekip gerekmediğini belirleyen bayrak. Bu seçenek varsayılan olarak `true` değerini alır.",
   "generateOptionsSchema.logging.processExit.markdownDescription": "Hedef işlem çıkış yaptığında veya hata ayıklama durdurulduğunda bir iletinin günlüğe kaydedilip kaydedilmeyeceğini denetler. Bu seçenek varsayılan olarak `true` değerini alır.",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "'includedModules' dizisinde olmayan veya 'includeSymbolsNextToModules' ayarı aracılığıyla eklenmeyen modüller için sembol yüklemeye çalışmayın.",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "'True' ise, Microsoft Sembol sunucusu (https​://msdl.microsoft.com​/download/symbols) sembol arama yoluna eklenir. Belirtilmezse, bu seçenek varsayılan olarak 'false' değerine ayarlanır.",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "'True' ise NuGet sembol sunucusu (https​://symbols.nuget.org​/download/symbols) sembol arama yoluna eklenir. Belirtilmezse bu seçenek varsayılan olarak 'false' değerine ayarlanır.",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": ".pdb dosyalarını aramak için sembol sunucusu URL’si (ör: http​://MyExampleSymbolServer) veya dizin (ör. /build/symbols) dizisi. Bu dizinler, modülün yanındaki varsayılan konumların yanı sıra, pdb'nin bırakıldığı yolda arama yapar.",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": ".pdb dosyalarını aramak için sembol sunucusuURL'leri (example: http​://MyExampleSymbolServer) veya dizinler (example: /build/symbols) dizisi. Bu dizinler, varsayılan konumlara (modülün ve pdb'nin ilk bırakıldığı yolun yanında) ek olarak aranır.",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[Yalnızca yerel macOS hata ayıklamasında desteklenir]\r\n\r\nHata ayıklanan mimarisi. Bu parametre ayarlanmazsa, bu değer otomatik olarak algılanır. İzin verilen değerler şunlardır: `x86_64` veya `arm64`.",
   "generateOptionsSchema.targetOutputLogPath.description": "Ayarlandığında hedef uygulamanın stdout ve stderr'a (ör. Console.WriteLine) yazdığı metin belirtilen dosyaya kaydedilir. Konsol, internalConsole dışında bir değere ayarlanmışsa bu seçenek yoksayılır. Ör. '${workspaceFolder}/out.txt'",
   "viewsWelcome.debug.contents": "[Derleme ve Hata Ayıklama için C# Varlıkları Oluşturma](command:dotnet.generateAssets)\r\n\r\nlaunch.json hakkında daha fazla bilgi edinmek için bkz. [C# hata ayıklaması için launch.json yapılandırma](https://aka.ms/VSCode-CS-LaunchJson)."
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
index 5b5cdd303..86ffd443e 100644
--- a/package.nls.zh-cn.json
+++ b/package.nls.zh-cn.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "附加到 .NET 5+ 或 .NET Core 进程",
+  "command.csharp.downloadDebugger": "下载 .NET Core 调试程序",
+  "command.csharp.listProcess": "列出要附加的进程",
+  "command.csharp.listRemoteDockerProcess": "列出 Docker 连接上的进程",
+  "command.csharp.listRemoteProcess": "列出远程连接上要附加的进程",
+  "command.csharp.reportIssue": "报告问题",
+  "command.csharp.showDecompilationTerms": "显示反编译程序条款协议",
+  "command.dotnet.generateAssets.currentProject": "生成用于生成和调试的资产",
+  "command.dotnet.openSolution": "打开解决方案",
+  "command.dotnet.restartServer": "重启语言服务器",
+  "command.dotnet.restore.all": "还原所有项目",
+  "command.dotnet.restore.project": "还原项目",
+  "command.dotnet.test.debugTestsInContext": "在上下文中调试测试",
+  "command.dotnet.test.runTestsInContext": "在上下文中运行测试",
+  "command.extension.showRazorCSharpWindow": "显示 Razor CSharp",
+  "command.extension.showRazorHtmlWindow": "显示 Razor Html",
+  "command.o.fixAll.document": "修复文档中出现的所有代码问题",
+  "command.o.fixAll.project": "修复项目中出现的所有代码问题",
+  "command.o.fixAll.solution": "修复解决方案中出现的所有代码问题",
+  "command.o.pickProjectAndStart": "选择项目",
+  "command.o.reanalyze.allProjects": "分析所有项目",
+  "command.o.reanalyze.currentProject": "分析当前项目",
+  "command.o.restart": "重新启动 OmniSharp",
+  "command.razor.reportIssue": "报告 Razor 问题",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "显示创建隐式对象的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "显示具有推断类型的变量的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "显示索引器的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "显示 lambda 参数类型的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "显示内联类型提示",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "对以下项运行后台代码分析:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "运行以下项的后台代码分析: (之前为 \"omnisharp.enableRoslynAnalyzers\")",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "整个解决方案",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "无",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "打开的文档",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "整个解决方案",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "无",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "打开的文档",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "指定是否应显示引用 CodeLens。",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "指定是否应显示运行和调试测试 CodeLens。",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "指定是否应显示引用 CodeLens。(之前为 \"csharp.referencesCodeLens.enabled\")",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "指定是否应显示运行和调试测试 CodeLens。(之前为 \"csharp.testsCodeLens.enabled\")",
   "configuration.dotnet.completion.provideRegexCompletions": "在完成列表中显示正则表达式。",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "支持在完成列表中显示不支持的类型和不支持的扩展方法。提交后，相应的 using 指令将添加到当前文件的顶部。",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "支持在完成列表中显示未导入的类型和未导入的扩展方法。提交后，相应的 using 指令将添加到当前文件的顶部。(之前为 \"omnisharp.enableImportCompletion\")",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "对最近选择的成员执行自动对象名称完成。",
-  "configuration.dotnet.defaultSolution.description": "要在工作区中打开的默认解决方案的路径，或设置为“禁用”以跳过它。",
+  "configuration.dotnet.defaultSolution.description": "要在工作区中打开的默认解决方案的路径，或者设置为“禁用”以跳过它。(之前为 \"omnisharp.defaultLaunchSolution\")",
   "configuration.dotnet.dotnetPath": "指定要使用的 dotnet 安装目录的路径，而不是默认的系统目录。这仅影响用于承载语言服务器本身的 dotnet 安装。示例: \"/home/username/mycustomdotnetdirectory\"。",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "突出显示光标下的相关 JSON 组件。",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "突出显示光标下的相关正则表达式组件。",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "当参数与参数名称匹配时抑制提示",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "当参数名称与方法的意图匹配时禁止显示提示",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "启用对分解源的导航。",
+  "configuration.dotnet.preferCSharpExtension": "仅强制使用 C# 扩展加载项目。使用 C# Dev Kit 不支持的旧项目类型时，这可能很有用。(需要重新加载窗口)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "显示符号时显示备注信息。",
+  "configuration.dotnet.server.crashDumpPath": "设置在语言服务器崩溃时在其中写入故障转储的文件夹路径。用户必须可以写入。",
   "configuration.dotnet.server.extensionPaths": "替代语言服务器 --extension 参数的路径",
-  "configuration.dotnet.server.path": "指定服务器 (LSP 或 O#) 可执行文件的绝对路径。如果留空，则会使用固定到 C# 扩展的版本。",
+  "configuration.dotnet.server.path": "指定服务器(LSP 或 O#)可执行文件的绝对路径。如果留空，会使用固定到 C# 扩展的版本。(之前为 \"omnisharp.path\")",
+  "configuration.dotnet.server.startTimeout": "为客户端指定一个超时 (以毫秒为单位)，以成功启动并连接到语言服务器。",
   "configuration.dotnet.server.trace": "设置语言服务器的日志记录级别",
-  "configuration.dotnet.server.waitForDebugger": "启动服务器时传递 --debug 标志，以允许附加调试器。",
+  "configuration.dotnet.server.waitForDebugger": "启动服务器时传递 --debug 标志，以允许附加调试器。(之前为 \"omnisharp.waitForDebugger\")",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "在引用程序集中搜索符号。它会影响需要符号搜索的功能，例如添加导入。",
-  "configuration.dotnet.unitTestDebuggingOptions": "启动单元测试调试时要与调试器一起使用的选项。",
+  "configuration.dotnet.unitTestDebuggingOptions": "启动单元测试调试时要与调试程序一起使用的选项。(之前为 \"csharp.unitTestDebuggingOptions\")",
   "configuration.razor.languageServer.debug": "指定在启动语言服务器时是否等待调试附加。",
   "configuration.razor.languageServer.directory": "重写 Razor 语言服务器目录的路径。",
   "configuration.razor.trace": "指定是否输出所有消息 [Verbose]、某些消息 [Messages] 或完全不输出 [Off]。",
   "configuration.razor.trace.messages": "仅记录来自 Razor 扩展的某些消息",
   "configuration.razor.trace.off": "不记录来自 Razor 扩展的消息",
   "configuration.razor.trace.verbose": "记录来自 Razor 扩展的所有消息",
+  "debuggers.coreclr.configurationSnippets.description.attach": "将 .NET 调试器 (coreclr) 附加到正在运行的进程。也可以使用“附加到 .NET 5+ 或 .NET Core 进程”命令完成此操作。",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "此代码片段用于在 Blazor WebAssembly 调试器 (blazorwasm) 下启动新进程，指定要启动的可执行文件的路径。在大多数情况下，“.NET: 启动 C# 项目”代码片段是更好的选择，但此代码片段可用于完全控制所有启动选项。此代码片段适用于托管的 Blazor 项目，该项目具有后端 ASP.NET 核心应用以提供其文件。",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "此代码片段用于在 Blazor WebAssembly 调试器 (blazorwasm) 下启动新进程。在大多数情况下，“.NET: 启动 C# 项目”代码片段是更好的选择，但此代码片段可用于完全控制所有启动选项。此代码片段适用于独立的 Blazor 项目，该项目不具有后端 ASP.NET 核心应用以提供其文件。",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "此代码片段用于在 .NET 调试器 (coreclr) 下启动新进程，指定要启动的可执行文件的路径。在大多数情况下，“.NET: 启动 C# 项目”代码片段是更好的选择。当项目在此 VS Code 实例外部生成，或者想要将 .NET Code 托管在自定义可执行文件(例如，特定版本的 “dotnet.exe”/'dotnet' )中或者 .NET Code 由本机应用程序托管时，此代码片段非常有用。此代码片段适用于控制台应用程序。",
+  "debuggers.coreclr.configurationSnippets.description.remote": "此代码片段演示了如何在 **不使用** VS Code 远程处理的情况下远程调试 .NET Code。如果要在本地生成项目但在另一台计算机上运行项目，应使用它。",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "此代码片段用于在 .NET 调试器 (coreclr) 下启动新进程，指定要启动的可执行文件的路径。在大多数情况下，“.NET: 启动 C# 项目”代码片段是更好的选择。当项目在此 VS Code 实例外部生成，或者想要将 .NET Code 托管在自定义可执行文件(例如，特定版本的 “dotnet.exe”/'dotnet' )中或者 .NET Code 由本机应用程序托管时，此代码片段非常有用。此代码片段适用于 Web (ASP.NET Core) 应用程序。",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: 附加到 .NET 进程",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: 远程调试 - 附加到 .NET 进程",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web 程序集 - 启动托管的 Blazor 项目",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web 程序集 - 启动独立的 Blazor 项目",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: 启动可执行文件(控制台)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: 远程调试 - 启动可执行文件(控制台)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: 启动可执行文件 (Web)",
+  "debuggers.dotnet.configurationSnippets.description": "此代码片段将 VS Code 配置为调试 C# 项目。可以通过“<project-directory>/Properties/launchSettings.json”文件配置调试选项(示例: 可执行文件的参数)。",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: 启动 C# 项目",
   "debuggers.dotnet.launch.launchConfigurationId.description": "要使用的启动配置 ID。空字符串将使用当前的活动配置。",
   "debuggers.dotnet.launch.projectPath.description": ".csproj 文件的路径。",
   "generateOptionsSchema.allowFastEvaluate.description": "如果为 true (默认状态)，调试器将尝试模拟简单属性和方法的执行以加快评估速度。",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "如果指定，则指示要使用的 launchSettings.json 中配置文件的名称。如果找不到 launchSettings.json，则忽略此项。将从指定的路径中读取 launchSettings.json，该路径应为 \"launchSettingsFilePath\" 属性或 {cwd}/Properties/launchSettings.json (如果未设置)。如果此项设置为 null 或空字符串，则忽略 launchSettings.json。如果未指定此值，将使用第一个“项目”配置文件。",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "用于确定是否应将启动 Web 浏览器中的 stdout 文本记录到输出窗口的标志。此选项默认为 \"true\"。",
   "generateOptionsSchema.logging.description": "用于确定应将哪些类型的消息记录到输出窗口的标志。",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "如果为 true，引擎日志记录将包括 \"adapterElapsedTime\" 和 \"engineElapsedTime\" 属性，以指示请求花费的时间(以微秒为单位)。此选项默认为 \"false\"。",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "用于确定是否应将诊断引擎日志记录到输出窗口的标志。此选项默认为 \"false\"。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "打印所有调试程序 API 调用。需要非常详细。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "打印调试程序 API 调用中的失败。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "控制是否应将对 Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h 的 API 调用打印到输出窗口。此选项默认为 `none`。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "禁用跟踪 API 调用",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "用于确定是否应启用详细跟踪基础运行时引发的事件的标志。此选项默认为 `false`。",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "用于控制从调试程序的诊断日志将哪些消息打印到输出窗口的设置。此日志旨在帮助解决调试程序的问题。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "打印错误级别诊断消息。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "打印重要的诊断消息。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "控制从调试程序的调度程序将哪些消息打印到输出窗口。如果未指定，将默认为 `none`，除非启用了一个详细日志设置 (`debugEngineAPITracing`、`debugRuntimeEventTracing`、`expressionEvaluationTracing` 或 `startDebuggingTracing`)，在这种情况下，默认值将更改为 `normal`。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "不打印其他诊断消息。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "打印所有非详细诊断消息。",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "用于确定是否应启用详细跟踪表达式计算的标志。此选项默认为 `false`。",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "用于确定是否应将 C# 调试程序和 UI 之间交换的 DAP 协议消息记录到输出窗口的标志。此选项默认为 `false`。",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "用于确定是否应启用详细跟踪启动调试的标志。此选项默认为 `false`。",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "如果为 true，协议消息日志记录将包括 \"adapterElapsedTime\" 和 \"engineElapsedTime\" 属性，以指示请求花费的时间(以微秒为单位)。此选项默认为 \"false\"。",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "\"logging.engineLogging\" 设置已弃用，取而代之的是 \"logging.diagnosticsLog.protocolMessages\"。",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "用于确定是否应将异常消息记录到输出窗口的标志。此选项默认为 \"true\"。",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "用于确定是否应将模块加载事件记录到输出窗口的标志。此选项默认为 \"true\"。",
   "generateOptionsSchema.logging.processExit.markdownDescription": "控制在目标进程退出或调试停止时是否记录消息。此选项默认为 \"true\"。",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "请勿尝试为任何模块加载符号，除非该模块在 \"includedModules\" 数组中，或者它通过 \"includeSymbolsNextToModules\" 设置包含在内。",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "如果为 \"true\"，则 Microsoft 符号服务器(https​://msdl.microsoft.com​/download/symbols)会添加到符号搜索路径。如果未指定，此选项会默认为 \"false\"。",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "如果为 \"true\"，NuGet.org 符号服务器 (https​://symbols.nuget.org​/download/symbols) 会添加到符号搜索路径。如果未指定，此选项默认为 \"false\"。",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "在其中搜索 .pdb 文件的符号服务器 URL (例如 http​://MyExampleSymbolServer)或目录(例如 /build/symbols)的数组。除了默认位置，还将搜索这些目录 - 在模块以及 pdb 最初放置到的路径的旁边。",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "在其中搜索 .pdb 文件的符号服务器 URL (example: http​://MyExampleSymbolServer)或目录(example: /build/symbols)的数组。除了默认位置，还将搜索这些目录 - 在模块以及 pdb 最初放置到的路径的旁边。",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[仅在本地 macOS 调试中受支持]\r\n\r\n调试对象的体系结构。除非设置了此参数，否则将自动检测到此参数。允许的值为 \"x86_64\" 或 \"arm64\"。",
   "generateOptionsSchema.targetOutputLogPath.description": "设置后，目标应用程序写入 stdout 和 stderr (例如 Console.WriteLine) 的文本将保存到指定的文件。如果控制台设置为 internalConsole 以外的其他内容，则忽略此选项。例如 \"${workspaceFolder}/out.txt\"",
   "viewsWelcome.debug.contents": "[为版本和调试生成 C# 资产](command:dotnet.generateAssets)\r\n\r\n若要了解有关 launch.json 的详细信息，请参阅 [为 C# 调试配置 launch.json](https://aka.ms/VSCode-CS-LaunchJson)。"
diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json
index 23b639531..8f8d7449b 100644
--- a/package.nls.zh-tw.json
+++ b/package.nls.zh-tw.json
@@ -1,10 +1,34 @@
 {
+  "command.csharp.attachToProcess": "連結至 .NET 5+ 或 .NET Core 程序",
+  "command.csharp.downloadDebugger": "下載 .NET Core 偵錯工具",
+  "command.csharp.listProcess": "列出連結的程序",
+  "command.csharp.listRemoteDockerProcess": "列出 Docker 連線上的程序",
+  "command.csharp.listRemoteProcess": "列出遠端連線上連結的程序",
+  "command.csharp.reportIssue": "回報問題",
+  "command.csharp.showDecompilationTerms": "顯示解編程式條款合約",
+  "command.dotnet.generateAssets.currentProject": "產生用於建置和偵錯的資產",
+  "command.dotnet.openSolution": "開啟方案",
+  "command.dotnet.restartServer": "重新啟動語言伺服器",
+  "command.dotnet.restore.all": "還原所有專案",
+  "command.dotnet.restore.project": "還原專案",
+  "command.dotnet.test.debugTestsInContext": "在內容中偵錯測試",
+  "command.dotnet.test.runTestsInContext": "在內容中執行測試",
+  "command.extension.showRazorCSharpWindow": "顯示 Razor CSharp",
+  "command.extension.showRazorHtmlWindow": "顯示 Razor HTML",
+  "command.o.fixAll.document": "修正文件內程式碼問題的所有出現項目",
+  "command.o.fixAll.project": "修正專案內程式碼問題的所有出現項目",
+  "command.o.fixAll.solution": "修正解決方案內程式碼問題的所有出現項目",
+  "command.o.pickProjectAndStart": "選取專案",
+  "command.o.reanalyze.allProjects": "分析所有專案",
+  "command.o.reanalyze.currentProject": "分析目前專案",
+  "command.o.restart": "重新啟動 OmniSharp",
+  "command.razor.reportIssue": "報告 Razor 問題",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": "顯示隱含物件建立的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": "顯示有推斷類型之變數的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "顯示索引子的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "顯示 Lambda 參數類型的提示",
   "configuration.csharp.inlayHints.enableInlayHintsForTypes": "顯示內嵌類型提示",
-  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "為以下項目執行背程式碼分析:",
+  "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "執行背景程式碼分析: (先前為 `omnisharp.enableRoslynAnalyzers`)",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "整個解決方案",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "無",
   "configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.openFiles": "開啟的文件",
@@ -12,12 +36,12 @@
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.fullSolution": "整個解決方案",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.none": "無",
   "configuration.dotnet.backgroundAnalysis.compilerDiagnosticsScope.openFiles": "開啟的文件",
-  "configuration.dotnet.codeLens.enableReferencesCodeLens": "指定是否應顯示參考 CodeLens。",
-  "configuration.dotnet.codeLens.enableTestsCodeLens": "指定是否應顯示執行和偵錯測試 CodeLens。",
+  "configuration.dotnet.codeLens.enableReferencesCodeLens": "指定是否應該顯示參考 CodeLens。(先前為 `csharp.referencesCodeLens.enabled`)",
+  "configuration.dotnet.codeLens.enableTestsCodeLens": "指定是否應顯示執行和偵錯測試 CodeLens。(先前為 `csharp.testsCodeLens.enabled`)",
   "configuration.dotnet.completion.provideRegexCompletions": "在完成清單中顯示規則運算式。",
-  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "啟用在完成清單中顯示未匯入的類型和未匯入的擴充方法的支援。認可時，適當的 using 指示詞會新增到目前檔案的頂端。",
+  "configuration.dotnet.completion.showCompletionItemsFromUnimportedNamespaces": "啟用在完成清單中顯示未匯入的類型和未匯入的擴充方法的支援。認可時，適當的 using 指示詞會新增到目前檔案的頂端。(先前為 `omnisharp.enableImportCompletion`)",
   "configuration.dotnet.completion.showNameCompletionSuggestions": "為您最近選取的成員執行自動物件名稱完成。",
-  "configuration.dotnet.defaultSolution.description": "要在工作區中開啟的預設解決方案路徑，或設為 [停用] 以略過它。",
+  "configuration.dotnet.defaultSolution.description": "要在工作區中開啟的預設解決方案路徑，或設為 [停用] 以略過它。(先前為 `omnisharp.defaultLaunchSolution`)",
   "configuration.dotnet.dotnetPath": "指定要使用的 dotnet 安裝目錄路徑，而非系統預設的路徑。這只會影響用來裝載語言伺服器本身的 dotnet 安裝。範例: \"/home/username/mycustomdotnetdirectory”。",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "反白資料指標下的相關 JSON 元件。",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "反白資料指標下的相關規則運算式元件。",
@@ -35,19 +59,37 @@
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName": "當引數符合參數名稱時抑制提示",
   "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "當參數名稱符合方法的意圖時，不出現提示",
   "configuration.dotnet.navigation.navigateToDecompiledSources": "啟用到反向組譯來源的瀏覽。",
+  "configuration.dotnet.preferCSharpExtension": "強制專案僅以 C# 延伸模組載入。使用 C# 開發人員套件不支援的舊版專案類型時，這會很有用。(需要重新載入視窗)",
   "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "顯示符號時顯示備註資訊。",
+  "configuration.dotnet.server.crashDumpPath": "設定當語言伺服器當機時要寫入當機傾印的資料夾路徑。必須可由使用者寫入。",
   "configuration.dotnet.server.extensionPaths": "覆寫語言伺服器 --extension 引數的路徑",
-  "configuration.dotnet.server.path": "指定伺服器 (LSP 或 O#) 可執行檔的絕對路徑。保留空白時，會使用釘選到 C# 延伸模組的版本。",
+  "configuration.dotnet.server.path": "指定伺服器 (LSP 或 O#) 可執行檔的絕對路徑。保留空白時，會使用釘選到 C# 延伸模組的版本。(先前為 `omnisharp.path`)",
+  "configuration.dotnet.server.startTimeout": "指定用戶端順利啟動並連接到語言伺服器的逾時 (毫秒)。",
   "configuration.dotnet.server.trace": "設定語言伺服器的記錄層次",
-  "configuration.dotnet.server.waitForDebugger": "啟動伺服器時傳遞 --debug 旗標，以允許附加偵錯工具。",
+  "configuration.dotnet.server.waitForDebugger": "啟動伺服器時傳遞 --debug 旗標，以允許附加偵錯工具。(先前為 `omnisharp.waitForDebugger`)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "在參考組件中搜尋符號。這會影響需要符號搜尋的功能，例如新增匯入。",
-  "configuration.dotnet.unitTestDebuggingOptions": "啟動單元測試偵錯時要搭配偵錯工具使用的選項。",
+  "configuration.dotnet.unitTestDebuggingOptions": "啟動單元測試偵錯時搭配偵錯工具使用的選項。(先前為 `csharp.unitTestDebuggingOptions`)",
   "configuration.razor.languageServer.debug": "指定啟動語言伺服器時，是否要等候偵錯附加。",
   "configuration.razor.languageServer.directory": "覆寫 Razor 語言伺服器目錄的路徑。",
   "configuration.razor.trace": "指定是否要輸出所有訊息 [Verbose]，部分訊息 [Messages] 或完全不 [Off]。",
   "configuration.razor.trace.messages": "只記錄來自 Razor 延伸模組的部分訊息",
   "configuration.razor.trace.off": "不記錄來自 Razor 延伸模組的訊息",
   "configuration.razor.trace.verbose": "記錄來自 Razor 延伸模組的所有訊息",
+  "debuggers.coreclr.configurationSnippets.description.attach": "將 .NET 偵錯工具 (coreclr) 連結到執行中的流程。這也可以使用 'Attach to a .NET 5+ or .NET Core process' 命令來完成。",
+  "debuggers.coreclr.configurationSnippets.description.blazor-hosted": "此程式碼片段可用來啟動 Blazor WebAssembly 偵錯工具 (blazorwasm) 下的新流程，並指定要啟動之可執行檔的路徑。在大部分情況下，「.NET: Launch C# project」程式碼片段是較佳的選擇，但此程式碼片段可用來完全控制所有啟動選項。此程式碼片段適用於裝載的 Blazor 專案，該專案是具有後端 ASP.NET Core 應用程式以提供其檔案服務的專案。",
+  "debuggers.coreclr.configurationSnippets.description.blazor-standalone": "此程式碼片段可用來啟動 Blazor WebAssembly 偵錯工具 (blazorwasm) 下的新流程。在大部分情況下，「.NET: Launch C# project」程式碼片段是較佳的選擇，但此程式碼片段可用來完全控制所有啟動選項。此程式碼片段適用於獨立的 Blazor 專案，該專案是具有後端 ASP.NET Core 應用程式以提供其檔案服務的專案。",
+  "debuggers.coreclr.configurationSnippets.description.console-local": "此程式碼片段可用來啟動 .NET 偵錯工具 (coreclr) 下的新流程，並指定要啟動之可執行檔的路徑。在大部分情況下，「.NET: Launch C# project」程式碼片段是較佳的選擇。當專案建置在此 VS Code 執行個體外，或您想要以自訂可執行檔裝載 .NET 程式碼時，此程式碼片段會很有用，例如特定版本的 'dotnet.exe'/'dotnet' 或 .NET Code 由原生應用程式裝載。此程式碼片段適用於主機應用程式。",
+  "debuggers.coreclr.configurationSnippets.description.remote": "此程式碼片段顯示如何 **不使用** VS Code 遠端功能來遠端偵錯 .NET Code。當您想要在本機建置專案，但在另一部電腦上執行時，應該使用它。",
+  "debuggers.coreclr.configurationSnippets.description.web-local": "此程式碼片段可用來啟動 .NET 偵錯工具 (coreclr) 下的新流程，並指定要啟動之可執行檔的路徑。在大部分情況下，「.NET: Launch C# project」程式碼片段是較佳的選擇。當專案建置在此 VS Code 執行個體外，或您想要以自訂可執行檔裝載 .NET 程式碼時，此程式碼片段會很有用，例如特定版本的 'dotnet.exe'/'dotnet' 或 .NET Code 由原生應用程式裝載。此程式碼片段適用於 Web (ASP.NET Core) 應用程式。",
+  "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: 附加至 .NET 流程",
+  "debuggers.coreclr.configurationSnippets.label.attach-remote": ".NET: 遠端偵錯 - 連結到 .NET 流程",
+  "debuggers.coreclr.configurationSnippets.label.blazor-hosted": ".NET: Web 組件 - 啟動裝載的 Blazor 專案",
+  "debuggers.coreclr.configurationSnippets.label.blazor-standalone": ".NET: Web 組件 - 啟動獨立的 Blazor 專案",
+  "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: 啟動可執行檔 (主機)",
+  "debuggers.coreclr.configurationSnippets.label.console-remote": ".NET: 遠端偵錯 - 啟動可執行檔 (主機)",
+  "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: 啟動可執行檔 (網頁)",
+  "debuggers.dotnet.configurationSnippets.description": "此程式碼片段會將 VS Code 設定為偵錯 C# 專案。偵錯選項 (範例: 可執行檔的引數) 可透過 '<project-directory>/Properties/launchSettings.json' 檔案設定。",
+  "debuggers.dotnet.configurationSnippets.label": ".NET: 啟動 C# 專案",
   "debuggers.dotnet.launch.launchConfigurationId.description": "要使用的啟動設定識別碼。空字串會使用目前的作用中設定。",
   "debuggers.dotnet.launch.projectPath.description": ".csproj 檔案的路徑。",
   "generateOptionsSchema.allowFastEvaluate.description": "當 true (預設狀態) 時，偵錯工具會模擬簡單屬性和方法的執行，以嘗試更快評估。",
@@ -81,8 +123,22 @@
   "generateOptionsSchema.launchSettingsProfile.description": "若指定，表示要在 launchSettings.json 中使用的設定檔名稱。如果找不到 launchSettings.json，則會略過此問題。將會從指定的路徑讀取 launchSettings.json，該路徑應該是 'launchSettingsFilePath' 屬性，如果未設定，則會 {cwd}/Properties/launchSettings.json。如果設定為 Null 或空字串，則會忽略 launchSettings.json。如果未指定此值，則會使用第一個 'Project' 設定檔。",
   "generateOptionsSchema.logging.browserStdOut.markdownDescription": "旗標，以決定是否應將啟動網頁瀏覽器的 stdout 文字記錄到輸出視窗。此選項預設為 'true'。",
   "generateOptionsSchema.logging.description": "旗標，判斷應記錄到輸出視窗的訊息類型。",
-  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "若為 true，引擎記錄將包含 'adapterElapsedTime' 和 'engineElapsedTime' 屬性，以表示要求所花費的時間，以微秒為單位。此選項預設為 'false'。",
-  "generateOptionsSchema.logging.engineLogging.markdownDescription": "判斷是否應將診斷引擎記錄記錄到輸出視窗的旗標。此選項預設為 'false'。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.all.enumDescription": "列印所有偵錯工具 API 呼叫。這非常詳細。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.error.enumDescription": "列印來自偵錯工具 API 呼叫的失敗。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.markdownDescription": "控制呼叫 Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h 的 API 是否應列印至輸出視窗。此選項預設為 `none`。",
+  "generateOptionsSchema.logging.diagnosticsLog.debugEngineAPITracing.none.enumDescription": "停用追蹤 API 呼叫",
+  "generateOptionsSchema.logging.diagnosticsLog.debugRuntimeEventTracing.markdownDescription": "判斷是否應該啟用基礎執行階段所引發事件的詳細追蹤的旗標。此選項預設為 `false`。",
+  "generateOptionsSchema.logging.diagnosticsLog.description": "控制哪些訊息要從偵錯工具的診斷記錄列印到輸出視窗的設定。此記錄是用來協助疑難排解偵錯工具的問題。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.error.enumDescription": "列印錯誤層級診斷訊息。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.important.enumDescription": "列印重要的診斷訊息。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.markdownDescription": "控制哪些訊息要從偵錯工具的 Dispatcher 列印到輸出視窗。如果未指定，除非啟用其中一個詳細記錄設定 (`debugEngineAPITracing`、`debugRuntimeEventTracing`、`expressionEvaluationTracing` 或 `startDebuggingTracing`)，其中的案例會預設變更為 `normal`，否則這會預設為 `none`。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.none.enumDescription": "不要列印其他診斷訊息。",
+  "generateOptionsSchema.logging.diagnosticsLog.dispatcherMessages.normal.enumDescription": "列印所有非詳細診斷訊息。",
+  "generateOptionsSchema.logging.diagnosticsLog.expressionEvaluationTracing.markdownDescription": "判斷是否應該為運算式評估啟用詳細追蹤的旗標。此選項預設為 `false`。",
+  "generateOptionsSchema.logging.diagnosticsLog.protocolMessages.markdownDescription": "判斷 C# 偵錯工具與 UI 之間交換的 DAP 通訊協定訊息是否應該記錄到輸出視窗的旗標。此選項預設為 `false`。",
+  "generateOptionsSchema.logging.diagnosticsLog.startDebuggingTracing.markdownDescription": "用來判斷是否應該為開始偵錯啟用詳細追蹤的旗標。此選項預設為 `false`。",
+  "generateOptionsSchema.logging.elapsedTiming.markdownDescription": "若為 true，通訊協定訊息記錄將包含 `adapterElapsedTime` 和 `engineElapsedTime` 屬性，以指出要求所花費的時間量 (以微秒為單位)。此選項預設為 `false`。",
+  "generateOptionsSchema.logging.engineLogging.deprecationMessage": "設定 'logging.engineLogging' 已被取代，以支援 'logging.diagnosticsLog.protocolMessages'。",
   "generateOptionsSchema.logging.exceptions.markdownDescription": "判斷是否應將例外狀況訊息記錄到輸出視窗的旗標。此選項預設為 'true'。",
   "generateOptionsSchema.logging.moduleLoad.markdownDescription": "判斷是否應將模組載入事件記錄到輸出視窗的旗標。此選項預設為 'true'。",
   "generateOptionsSchema.logging.processExit.markdownDescription": "控制是否在目標進程結束或偵錯停止時記錄訊息。此選項預設為 'true'。",
@@ -138,7 +194,7 @@
   "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadOnlyIncluded.enumDescription": "請勿嘗試載入任何模組的符號，除非其位於 'includedModules' 陣列中，或包含在 'includeSymbolsNextToModules' 設定中。",
   "generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description": "如果是 'true'，則會將 Microsoft 符號伺服器 (https​://msdl.microsoft.com​/download/symbols) 新增至符號搜尋路徑。若未指定，這個選項會預設為 'false'。",
   "generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description": "如果是 'true'，則會將 NuGet.org 符號伺服器 (https​://symbols.nuget.org​/download/symbols) 新增至符號搜尋路徑。若未指定，這個選項會預設為 'false'。",
-  "generateOptionsSchema.symbolOptions.searchPaths.description": "符號陣列伺服器 URL (範例: http​://MyExampleSymbolServer) 或目錄 (範例: /build/symbols) 搜尋 .pdb 檔案。除了預設位置 (位於模組旁和 pdb 原先放置的路徑)，也會搜尋這些目錄。",
+  "generateOptionsSchema.symbolOptions.searchPaths.description": "符號陣列伺服器 URL (example: http​://MyExampleSymbolServer) 或目錄 (範例: /build/symbols) 搜尋 .pdb 檔案。除了預設位置 (位於模組旁和 pdb 原先放置的路徑)，也會搜尋這些目錄。",
   "generateOptionsSchema.targetArchitecture.markdownDescription": "[僅支援在局部 macOS 偵錯]\r\n\r\n偵錯程式的架構。除非設定此參數，否則會自動偵測到此情況。允許的值為 'x86_64' 或 'arm64'。",
   "generateOptionsSchema.targetOutputLogPath.description": "設定時，目標應用程式寫入 stdout 和 stderr 的文字 (例如: Console.WriteLine) 將會儲存到指定的檔案。如果主控台設定為 internalConsole 以外的項目，則會略過此選項。例如 '${workspaceFolder}/out.txt'",
   "viewsWelcome.debug.contents": "[為組建和偵錯產生 C# 資產](command:dotnet.generateAssets)\r\n\r\n若要深入了解 launch.json，請參閱[為 C# 偵錯設定 launch.json](https://aka.ms/VSCode-CS-LaunchJson)(英文)。"
diff --git a/server/ServerDownload.csproj b/server/ServerDownload.csproj
index 3d88b952a..bde703f88 100644
--- a/server/ServerDownload.csproj
+++ b/server/ServerDownload.csproj
@@ -20,7 +20,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageDownload Include="Microsoft.CodeAnalysis.LanguageServer" version="[$(MicrosoftCodeAnalysisLanguageServerVersion)]" />
+        <PackageDownload Include="$(PackageName)" version="[$(PackageVersion)]" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/common.ts b/src/common.ts
index 313222947..6e4d062bf 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -186,21 +186,21 @@ export function convertNativePathToPosix(pathString: string): string {
 }
 
 /**
- * This function checks to see if a subfolder is part of folder.
+ * This function checks to see if a subfolder is part of a parent folder.
  *
- * Assumes subfolder and folder are absolute paths and have consistent casing.
+ * Assumes subfolder and parent folder are absolute paths and have consistent casing.
  *
- * @param subfolder subfolder to check if it is part of the folder parameter
- * @param folder folder to check aganist
+ * @param subfolder subfolder to check if it is part of the parent folder parameter
+ * @param parentFolder folder to check aganist
  */
-export function isSubfolderOf(subfolder: string, folder: string): boolean {
+export function isSubfolderOf(subfolder: string, parentFolder: string): boolean {
     const subfolderArray: string[] = subfolder.split(path.sep);
-    const folderArray: string[] = folder.split(path.sep);
+    const parentFolderArray: string[] = parentFolder.split(path.sep);
 
     // Check to see that every sub directory in subfolder exists in folder.
     return (
-        subfolderArray.length <= folderArray.length &&
-        subfolderArray.every((subpath, index) => folderArray[index] === subpath)
+        parentFolderArray.length <= subfolder.length &&
+        parentFolderArray.every((subpath, index) => subfolderArray[index] === subpath)
     );
 }
 
@@ -226,3 +226,9 @@ export function findPowerShell(): string | undefined {
         }
     }
 }
+
+export function isNotNull<T>(value: T): asserts value is NonNullable<T> {
+    if (value === null || value === undefined) {
+        throw new Error('value is null or undefined.');
+    }
+}
diff --git a/src/coreclrDebug/activate.ts b/src/coreclrDebug/activate.ts
index f2edfa39e..1d419d882 100644
--- a/src/coreclrDebug/activate.ts
+++ b/src/coreclrDebug/activate.ts
@@ -16,23 +16,20 @@ import {
 import { EventStream } from '../eventStream';
 import { getRuntimeDependencyPackageWithId } from '../tools/runtimeDependencyPackageUtils';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
-import { Options } from '../shared/options';
 import { RemoteAttachPicker } from '../features/processPicker';
 import CompositeDisposable from '../compositeDisposable';
 import { BaseVsDbgConfigurationProvider } from '../shared/configurationProvider';
-import OptionProvider from '../shared/observers/optionProvider';
+import { omnisharpOptions } from '../shared/options';
 
 export async function activate(
     thisExtension: vscode.Extension<any>,
     context: vscode.ExtensionContext,
     platformInformation: PlatformInformation,
     eventStream: EventStream,
-    csharpOutputChannel: vscode.OutputChannel,
-    optionProvider: OptionProvider
+    csharpOutputChannel: vscode.OutputChannel
 ) {
     const disposables = new CompositeDisposable();
 
-    const options: Options = optionProvider.GetLatestOptions();
     const debugUtil = new CoreClrDebugUtil(context.extensionPath);
 
     if (!CoreClrDebugUtil.existsSync(debugUtil.debugAdapterDir())) {
@@ -48,7 +45,7 @@ export async function activate(
             showInstallErrorMessage(eventStream);
         }
     } else if (!CoreClrDebugUtil.existsSync(debugUtil.installCompleteFilePath())) {
-        completeDebuggerInstall(debugUtil, platformInformation, eventStream, options);
+        completeDebuggerInstall(debugUtil, platformInformation, eventStream);
     }
 
     // register process picker for attach for legacy configurations.
@@ -86,14 +83,13 @@ export async function activate(
         platformInformation,
         eventStream,
         thisExtension.packageJSON,
-        thisExtension.extensionPath,
-        options
+        thisExtension.extensionPath
     );
     /** 'clr' type does not have a intial configuration provider, but we need to register it to support the common debugger features listed in {@link BaseVsDbgConfigurationProvider} */
     context.subscriptions.push(
         vscode.debug.registerDebugConfigurationProvider(
             'clr',
-            new BaseVsDbgConfigurationProvider(platformInformation, optionProvider, csharpOutputChannel)
+            new BaseVsDbgConfigurationProvider(platformInformation, csharpOutputChannel)
         )
     );
     disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('coreclr', factory));
@@ -155,11 +151,10 @@ async function checkIsValidArchitecture(
 async function completeDebuggerInstall(
     debugUtil: CoreClrDebugUtil,
     platformInformation: PlatformInformation,
-    eventStream: EventStream,
-    options: Options
+    eventStream: EventStream
 ): Promise<boolean> {
     try {
-        await debugUtil.checkDotNetCli(options.omnisharpOptions.dotNetCliPaths);
+        await debugUtil.checkDotNetCli(omnisharpOptions.dotNetCliPaths);
         const isValidArchitecture = await checkIsValidArchitecture(platformInformation, eventStream);
         if (!isValidArchitecture) {
             eventStream.post(new DebuggerNotInstalledFailure());
@@ -226,8 +221,7 @@ export class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescrip
         private readonly platformInfo: PlatformInformation,
         private readonly eventStream: EventStream,
         private readonly packageJSON: any,
-        private readonly extensionPath: string,
-        private readonly options: Options
+        private readonly extensionPath: string
     ) {}
 
     async createDebugAdapterDescriptor(
@@ -267,12 +261,7 @@ export class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescrip
             }
             // install.complete does not exist, check dotnetCLI to see if we can complete.
             else if (!CoreClrDebugUtil.existsSync(util.installCompleteFilePath())) {
-                const success = await completeDebuggerInstall(
-                    this.debugUtil,
-                    this.platformInfo,
-                    this.eventStream,
-                    this.options
-                );
+                const success = await completeDebuggerInstall(this.debugUtil, this.platformInfo, this.eventStream);
                 if (!success) {
                     this.eventStream.post(new DebuggerNotInstalledFailure());
                     throw new Error(
@@ -288,7 +277,7 @@ export class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescrip
 
         // use the executable specified in the package.json if it exists or determine it based on some other information (e.g. the session)
         if (!executable) {
-            const dotNetInfo = await getDotnetInfo(this.options.omnisharpOptions.dotNetCliPaths);
+            const dotNetInfo = await getDotnetInfo(omnisharpOptions.dotNetCliPaths);
             const targetArchitecture = getTargetArchitecture(
                 this.platformInfo,
                 _session.configuration.targetArchitecture,
@@ -321,21 +310,3 @@ export class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescrip
         return executable;
     }
 }
-
-let _brokeredServicePipeName: string | undefined;
-
-/**
- * Initialize brokered service pipe name from C# dev kit, if available.
- *
- * @param csDevKitPipeName Activated brokered service pipe name activated by {@link CSharpDevKitExports}.
- */
-export function initializeBrokeredServicePipeName(csDevKitPipeName: string) {
-    _brokeredServicePipeName = csDevKitPipeName;
-}
-
-/**
- * Fetch the brokered service pipe name from C# dev kit, if available.
- */
-export function getBrokeredServicePipeName(): string | undefined {
-    return _brokeredServicePipeName;
-}
diff --git a/src/coreclrDebug/provisionalDebugSessionTracker.ts b/src/coreclrDebug/provisionalDebugSessionTracker.ts
new file mode 100644
index 000000000..28bf067bd
--- /dev/null
+++ b/src/coreclrDebug/provisionalDebugSessionTracker.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+/**
+ * This tracks a debug session until C# dev kit is loaded (if present) and STOPS tracking any existing
+ * debug session after C# dev kit is loaded.
+ * The idea is to avoid a race condition if a debugging session starts before C# dev kit is initialized,
+ * since the brokered service pipe name will be sent with a 'launch' command.
+ * If the extension loads during an existing session, rather than not initializing any C# dev kit services (such as hot reload),
+ * this sends a custom request to the engine with the brokered service pipe name in order to initialize it.
+ */
+export class ProvisionalDebugSessionTracker {
+    private _sessions: Set<vscode.DebugSession> | undefined = new Set<vscode.DebugSession>();
+
+    private _onDidStartDebugSession: vscode.Disposable | undefined;
+    private _onDidTerminateDebugSession: vscode.Disposable | undefined;
+
+    private _brokeredServicePipeName: string | undefined;
+
+    /**
+     * Initializes the debug session handlers.
+     */
+    initializeDebugSessionHandlers(context: vscode.ExtensionContext): void {
+        this._onDidStartDebugSession = vscode.debug.onDidStartDebugSession(this.onDidStartDebugSession.bind(this));
+
+        this._onDidTerminateDebugSession = vscode.debug.onDidTerminateDebugSession((session: vscode.DebugSession) => {
+            this.onDidTerminateDebugSession(session);
+        });
+
+        context.subscriptions.push(this._onDidStartDebugSession);
+        context.subscriptions.push(this._onDidTerminateDebugSession);
+    }
+
+    /**
+     * Tracks a debug session until it is terminated.
+     * @param session Debug session.
+     */
+    onDidStartDebugSession(session: vscode.DebugSession): void {
+        if (session.type !== 'coreclr') {
+            return;
+        }
+
+        this._sessions?.add(session);
+    }
+
+    /**
+     * Notifies that a debug session has been terminated.
+     */
+    onDidTerminateDebugSession(session: vscode.DebugSession): void {
+        this._sessions?.delete(session);
+    }
+
+    /**
+     * If there is any active debug session, this notifies the engine that csdevkit was loaded.
+     * @param csDevKitPipeName Brokered service pipe name activated by {@link CSharpDevKitExports}.
+     */
+    async onCsDevKitInitialized(csDevKitPipeName: string): Promise<void> {
+        this._brokeredServicePipeName = csDevKitPipeName;
+
+        const sessions = this._sessions;
+        if (sessions != undefined) {
+            // Debugging session already started, send a custom DAP request to the engine.
+            sessions.forEach((s) => s.customRequest('initializeBrokeredServicePipeName', csDevKitPipeName));
+        }
+
+        // Since C# dev kit was initialized, we no longer need to track debugging sessions.
+        this.cleanup();
+    }
+
+    /**
+     * Fetches the brokered service pipe name from C# dev kit, if available.
+     */
+    getBrokeredServicePipeName(): string | undefined {
+        return this._brokeredServicePipeName;
+    }
+
+    /**
+     * No longer tracks any debugging session going forward.
+     */
+    cleanup(): void {
+        this._sessions?.clear();
+        this._sessions = undefined;
+
+        this._onDidStartDebugSession?.dispose();
+        this._onDidTerminateDebugSession?.dispose();
+    }
+}
+
+export const debugSessionTracker = new ProvisionalDebugSessionTracker();
diff --git a/src/csharpExtensionExports.ts b/src/csharpExtensionExports.ts
index 6613aab12..35e85b615 100644
--- a/src/csharpExtensionExports.ts
+++ b/src/csharpExtensionExports.ts
@@ -9,6 +9,7 @@ import { EventStream } from './eventStream';
 import TestManager from './features/dotnetTest';
 import { GlobalBrokeredServiceContainer } from '@microsoft/servicehub-framework';
 import { RequestType } from 'vscode-languageclient/node';
+import { LanguageServerEvents } from './lsptoolshost/languageServerEvents';
 
 export interface OmnisharpExtensionExports {
     initializationFinished: () => Promise<void>;
@@ -32,4 +33,5 @@ export interface CSharpExtensionExperimentalExports {
         params: Params,
         token: vscode.CancellationToken
     ) => Promise<Response>;
+    languageServerEvents: LanguageServerEvents;
 }
diff --git a/src/features/codeActionProvider.ts b/src/features/codeActionProvider.ts
index 636f71bbe..5ab024d14 100644
--- a/src/features/codeActionProvider.ts
+++ b/src/features/codeActionProvider.ts
@@ -9,9 +9,9 @@ import AbstractProvider from './abstractProvider';
 import * as protocol from '../omnisharp/protocol';
 import * as serverUtils from '../omnisharp/utils';
 import CompositeDisposable from '../compositeDisposable';
-import OptionProvider from '../shared/observers/optionProvider';
 import { LanguageMiddlewareFeature } from '../omnisharp/languageMiddlewareFeature';
 import { buildEditForResponse } from '../omnisharp/fileOperationsResponseEditBuilder';
+import { omnisharpOptions } from '../shared/options';
 
 export default class OmniSharpCodeActionProvider
     extends AbstractProvider
@@ -19,11 +19,7 @@ export default class OmniSharpCodeActionProvider
 {
     private _commandId: string;
 
-    constructor(
-        server: OmniSharpServer,
-        private optionProvider: OptionProvider,
-        languageMiddlewareFeature: LanguageMiddlewareFeature
-    ) {
+    constructor(server: OmniSharpServer, languageMiddlewareFeature: LanguageMiddlewareFeature) {
         super(server, languageMiddlewareFeature);
         this._commandId = 'omnisharp.runCodeAction';
         const registerCommandDisposable = vscode.commands.registerCommand(this._commandId, this._runCodeAction, this);
@@ -36,8 +32,7 @@ export default class OmniSharpCodeActionProvider
         context: vscode.CodeActionContext,
         token: vscode.CancellationToken
     ): Promise<vscode.CodeAction[] | undefined> {
-        const options = this.optionProvider.GetLatestOptions();
-        if (options.omnisharpOptions.disableCodeActions) {
+        if (omnisharpOptions.disableCodeActions) {
             return;
         }
 
diff --git a/src/features/codeLensProvider.ts b/src/features/codeLensProvider.ts
index 91ebe1310..120faad6f 100644
--- a/src/features/codeLensProvider.ts
+++ b/src/features/codeLensProvider.ts
@@ -9,9 +9,8 @@ import * as vscode from 'vscode';
 import { toLocation } from '../omnisharp/typeConversion';
 import AbstractProvider from './abstractProvider';
 import { OmniSharpServer } from '../omnisharp/server';
-import { Options } from '../shared/options';
+import { omnisharpOptions } from '../shared/options';
 import TestManager from './dotnetTest';
-import OptionProvider from '../shared/observers/optionProvider';
 
 import Structure = protocol.V2.Structure;
 import SymbolKinds = protocol.V2.SymbolKinds;
@@ -79,7 +78,6 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
     constructor(
         server: OmniSharpServer,
         testManager: TestManager,
-        private optionProvider: OptionProvider,
         languageMiddlewareFeature: LanguageMiddlewareFeature
     ) {
         super(server, languageMiddlewareFeature);
@@ -89,15 +87,14 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
         document: vscode.TextDocument,
         token: vscode.CancellationToken
     ): Promise<vscode.CodeLens[]> {
-        const options = this.optionProvider.GetLatestOptions();
-        if (!options.omnisharpOptions.showReferencesCodeLens && !options.omnisharpOptions.showTestsCodeLens) {
+        if (!omnisharpOptions.showReferencesCodeLens && !omnisharpOptions.showTestsCodeLens) {
             return [];
         }
 
         try {
             const response = await serverUtils.codeStructure(this._server, { FileName: document.fileName }, token);
             if (response && response.Elements) {
-                return createCodeLenses(response.Elements, document.fileName, options);
+                return createCodeLenses(response.Elements, document.fileName);
             }
         } catch (error) {
             /* empty */
@@ -207,11 +204,11 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
     }
 }
 
-function createCodeLenses(elements: Structure.CodeElement[], fileName: string, options: Options): vscode.CodeLens[] {
+function createCodeLenses(elements: Structure.CodeElement[], fileName: string): vscode.CodeLens[] {
     const results: vscode.CodeLens[] = [];
 
     Structure.walkCodeElements(elements, (element) => {
-        const codeLenses = createCodeLensesForElement(element, fileName, options);
+        const codeLenses = createCodeLensesForElement(element, fileName);
 
         results.push(...codeLenses);
     });
@@ -219,21 +216,17 @@ function createCodeLenses(elements: Structure.CodeElement[], fileName: string, o
     return results;
 }
 
-function createCodeLensesForElement(
-    element: Structure.CodeElement,
-    fileName: string,
-    options: Options
-): vscode.CodeLens[] {
+function createCodeLensesForElement(element: Structure.CodeElement, fileName: string): vscode.CodeLens[] {
     const results: vscode.CodeLens[] = [];
 
-    if (options.omnisharpOptions.showReferencesCodeLens && isValidElementForReferencesCodeLens(element, options)) {
+    if (omnisharpOptions.showReferencesCodeLens && isValidElementForReferencesCodeLens(element)) {
         const range = element.Ranges[SymbolRangeNames.Name];
         if (range) {
             results.push(new ReferencesCodeLens(range, fileName));
         }
     }
 
-    if (options.omnisharpOptions.showTestsCodeLens) {
+    if (omnisharpOptions.showTestsCodeLens) {
         if (element.Kind === SymbolKinds.Method) {
             const test = getTest(element);
             if (test !== undefined) {
@@ -312,7 +305,7 @@ const filteredSymbolNames: { [name: string]: boolean } = {
     GetEnumerator: true,
 };
 
-function isValidElementForReferencesCodeLens(element: Structure.CodeElement, options: Options): boolean {
+function isValidElementForReferencesCodeLens(element: Structure.CodeElement): boolean {
     if (element.Kind === SymbolKinds.Namespace) {
         return false;
     }
@@ -321,7 +314,7 @@ function isValidElementForReferencesCodeLens(element: Structure.CodeElement, opt
         return false;
     }
 
-    if (options.omnisharpOptions.filteredSymbolsCodeLens.includes(element.Name)) {
+    if (omnisharpOptions.filteredSymbolsCodeLens.includes(element.Name)) {
         return false;
     }
 
diff --git a/src/features/commands.ts b/src/features/commands.ts
index 46e64e158..f57ecd8b2 100644
--- a/src/features/commands.ts
+++ b/src/features/commands.ts
@@ -23,7 +23,6 @@ import {
 import { EventStream } from '../eventStream';
 import { PlatformInformation } from '../shared/platform';
 import CompositeDisposable from '../compositeDisposable';
-import OptionProvider from '../shared/observers/optionProvider';
 import reportIssue from '../shared/reportIssue';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
@@ -35,20 +34,13 @@ export default function registerCommands(
     server: OmniSharpServer,
     platformInfo: PlatformInformation,
     eventStream: EventStream,
-    optionProvider: OptionProvider,
     monoResolver: IHostExecutableResolver,
     dotnetResolver: IHostExecutableResolver,
     workspaceInformationProvider: IWorkspaceDebugInformationProvider
 ): CompositeDisposable {
     const disposable = new CompositeDisposable();
-    disposable.add(
-        vscode.commands.registerCommand('o.restart', async () => restartOmniSharp(context, server, optionProvider))
-    );
-    disposable.add(
-        vscode.commands.registerCommand('o.pickProjectAndStart', async () =>
-            pickProjectAndStart(server, optionProvider)
-        )
-    );
+    disposable.add(vscode.commands.registerCommand('o.restart', async () => restartOmniSharp(context, server)));
+    disposable.add(vscode.commands.registerCommand('o.pickProjectAndStart', async () => pickProjectAndStart(server)));
     disposable.add(vscode.commands.registerCommand('o.showOutput', () => eventStream.post(new ShowOmniSharpChannel())));
 
     disposable.add(
@@ -77,11 +69,9 @@ export default function registerCommands(
     disposable.add(
         vscode.commands.registerCommand('csharp.reportIssue', async () =>
             reportIssue(
-                vscode,
                 context.extension.packageJSON.version,
                 getDotnetInfo,
                 platformInfo.isValidPlatformForMono(),
-                optionProvider.GetLatestOptions(),
                 dotnetResolver,
                 monoResolver
             )
@@ -90,31 +80,23 @@ export default function registerCommands(
 
     disposable.add(
         vscode.commands.registerCommand('csharp.showDecompilationTerms', async () =>
-            showDecompilationTerms(context, server, optionProvider)
+            showDecompilationTerms(context, server)
         )
     );
 
     return new CompositeDisposable(disposable);
 }
 
-async function showDecompilationTerms(
-    context: vscode.ExtensionContext,
-    server: OmniSharpServer,
-    optionProvider: OptionProvider
-) {
+async function showDecompilationTerms(context: vscode.ExtensionContext, server: OmniSharpServer) {
     // Reset the decompilation authorization so the user will be prompted on restart.
     resetDecompilationAuthorization(context);
 
-    await restartOmniSharp(context, server, optionProvider);
+    await restartOmniSharp(context, server);
 }
 
-async function restartOmniSharp(
-    context: vscode.ExtensionContext,
-    server: OmniSharpServer,
-    optionProvider: OptionProvider
-) {
+async function restartOmniSharp(context: vscode.ExtensionContext, server: OmniSharpServer) {
     // Update decompilation authorization.
-    server.decompilationAuthorized = await getDecompilationAuthorization(context, optionProvider);
+    server.decompilationAuthorized = await getDecompilationAuthorization(context);
 
     if (server.isRunning()) {
         server.restart();
@@ -123,9 +105,8 @@ async function restartOmniSharp(
     }
 }
 
-async function pickProjectAndStart(server: OmniSharpServer, optionProvider: OptionProvider): Promise<void> {
-    const options = optionProvider.GetLatestOptions();
-    return findLaunchTargets(options).then(async (targets) => {
+async function pickProjectAndStart(server: OmniSharpServer): Promise<void> {
+    return findLaunchTargets().then(async (targets) => {
         const currentPath = server.getSolutionPathOrFolder();
         if (currentPath) {
             for (const target of targets) {
diff --git a/src/features/diagnosticsProvider.ts b/src/features/diagnosticsProvider.ts
index 620a01dff..2e56a505e 100644
--- a/src/features/diagnosticsProvider.ts
+++ b/src/features/diagnosticsProvider.ts
@@ -13,11 +13,11 @@ import CompositeDisposable from '../compositeDisposable';
 import { IDisposable } from '../disposable';
 import { isVirtualCSharpDocument } from './virtualDocumentTracker';
 import { TextDocument } from '../vscodeAdapter';
-import OptionProvider from '../shared/observers/optionProvider';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { BackgroundDiagnosticStatus } from '../omnisharp/protocol';
 import { LanguageMiddlewareFeature } from '../omnisharp/languageMiddlewareFeature';
+import { omnisharpOptions } from '../shared/options';
 
 export class Advisor {
     private _disposable: CompositeDisposable;
@@ -25,7 +25,7 @@ export class Advisor {
     private _packageRestoreCounter = 0;
     private _projectSourceFileCounts: { [path: string]: number } = Object.create(null);
 
-    constructor(server: OmniSharpServer, private optionProvider: OptionProvider) {
+    constructor(server: OmniSharpServer) {
         this._server = server;
 
         const d1 = server.onProjectChange(this._onProjectChange, this);
@@ -93,8 +93,7 @@ export class Advisor {
     }
 
     private _isOverFileLimit(): boolean {
-        const opts = this.optionProvider.GetLatestOptions();
-        const fileLimit = opts.omnisharpOptions.maxProjectFileCountForDiagnosticAnalysis;
+        const fileLimit = omnisharpOptions.maxProjectFileCountForDiagnosticAnalysis;
         if (fileLimit > 0) {
             let sourceFileCount = 0;
             for (const key in this._projectSourceFileCounts) {
@@ -111,10 +110,9 @@ export class Advisor {
 export default function reportDiagnostics(
     server: OmniSharpServer,
     advisor: Advisor,
-    languageMiddlewareFeature: LanguageMiddlewareFeature,
-    options: OptionProvider
+    languageMiddlewareFeature: LanguageMiddlewareFeature
 ): IDisposable {
-    return new OmniSharpDiagnosticsProvider(server, advisor, languageMiddlewareFeature, options);
+    return new OmniSharpDiagnosticsProvider(server, advisor, languageMiddlewareFeature);
 }
 
 class OmniSharpDiagnosticsProvider extends AbstractSupport {
@@ -130,8 +128,7 @@ class OmniSharpDiagnosticsProvider extends AbstractSupport {
     constructor(
         server: OmniSharpServer,
         validationAdvisor: Advisor,
-        languageMiddlewareFeature: LanguageMiddlewareFeature,
-        options: OptionProvider
+        languageMiddlewareFeature: LanguageMiddlewareFeature
     ) {
         super(server, languageMiddlewareFeature);
 
@@ -153,7 +150,7 @@ class OmniSharpDiagnosticsProvider extends AbstractSupport {
             .getConfiguration('csharp')
             .get('suppressHiddenDiagnostics', true);
 
-        if (!options.GetLatestOptions().omnisharpOptions.enableLspDriver) {
+        if (!omnisharpOptions.enableLspDriver) {
             this._subscriptions.push(
                 this._validateCurrentDocumentPipe
                     .pipe(debounceTime(750))
diff --git a/src/features/dotnetTest.ts b/src/features/dotnetTest.ts
index 5d06533eb..040e20ffa 100644
--- a/src/features/dotnetTest.ts
+++ b/src/features/dotnetTest.ts
@@ -34,7 +34,7 @@ import LaunchConfiguration from './launchConfiguration';
 import Disposable from '../disposable';
 import CompositeDisposable from '../compositeDisposable';
 import { LanguageMiddlewareFeature } from '../omnisharp/languageMiddlewareFeature';
-import OptionProvider from '../shared/observers/optionProvider';
+import { commonOptions } from '../shared/options';
 
 const TelemetryReportingDelay = 2 * 60 * 1000; // two minutes
 
@@ -45,7 +45,6 @@ export default class TestManager extends AbstractProvider {
     private _eventStream: EventStream;
 
     constructor(
-        private optionProvider: OptionProvider,
         server: OmniSharpServer,
         eventStream: EventStream,
         languageMiddlewareFeature: LanguageMiddlewareFeature
@@ -233,7 +232,7 @@ export default class TestManager extends AbstractProvider {
     }
 
     private _getRunSettings(filename: string): string | undefined {
-        const testSettingsPath = this.optionProvider.GetLatestOptions().omnisharpOptions.testRunSettings;
+        const testSettingsPath = commonOptions.runSettingsPath;
         if (testSettingsPath.length === 0) {
             return undefined;
         }
@@ -393,7 +392,7 @@ export default class TestManager extends AbstractProvider {
         environmentVariables: Map<string, string>,
         debuggerEventsPipeName: string
     ) {
-        const debugOptions = this.optionProvider.GetLatestOptions().commonOptions.unitTestDebuggingOptions;
+        const debugOptions = commonOptions.unitTestDebuggingOptions;
 
         // Get the initial set of options from the workspace setting
         let result: any;
diff --git a/src/features/semanticTokensProvider.ts b/src/features/semanticTokensProvider.ts
index 5f2340a1f..87cbc54da 100644
--- a/src/features/semanticTokensProvider.ts
+++ b/src/features/semanticTokensProvider.ts
@@ -10,8 +10,8 @@ import * as serverUtils from '../omnisharp/utils';
 import { createRequest, toRange2 } from '../omnisharp/typeConversion';
 import AbstractProvider from './abstractProvider';
 import { OmniSharpServer } from '../omnisharp/server';
-import OptionProvider from '../shared/observers/optionProvider';
 import { LanguageMiddlewareFeature } from '../omnisharp/languageMiddlewareFeature';
+import { omnisharpOptions } from '../shared/options';
 
 // The default TokenTypes defined by VS Code https://github.com/microsoft/vscode/blob/master/src/vs/platform/theme/common/tokenClassificationRegistry.ts#L393
 enum DefaultTokenType {
@@ -162,11 +162,7 @@ export default class OmniSharpSemanticTokensProvider
     extends AbstractProvider
     implements vscode.DocumentSemanticTokensProvider, vscode.DocumentRangeSemanticTokensProvider
 {
-    constructor(
-        server: OmniSharpServer,
-        private optionProvider: OptionProvider,
-        languageMiddlewareFeature: LanguageMiddlewareFeature
-    ) {
+    constructor(server: OmniSharpServer, languageMiddlewareFeature: LanguageMiddlewareFeature) {
         super(server, languageMiddlewareFeature);
     }
 
@@ -209,8 +205,7 @@ export default class OmniSharpSemanticTokensProvider
             return null;
         }
 
-        const options = this.optionProvider.GetLatestOptions();
-        if (!options.omnisharpOptions.useSemanticHighlighting) {
+        if (!omnisharpOptions.useSemanticHighlighting) {
             return null;
         }
 
diff --git a/src/features/workspaceSymbolProvider.ts b/src/features/workspaceSymbolProvider.ts
index 3cb114a6f..53f576ac0 100644
--- a/src/features/workspaceSymbolProvider.ts
+++ b/src/features/workspaceSymbolProvider.ts
@@ -5,18 +5,17 @@
 
 import AbstractSupport from './abstractProvider';
 import { OmniSharpServer } from '../omnisharp/server';
-import OptionProvider from '../shared/observers/optionProvider';
 import * as protocol from '../omnisharp/protocol';
 import * as serverUtils from '../omnisharp/utils';
 import { toRange } from '../omnisharp/typeConversion';
 import { CancellationToken, Uri, WorkspaceSymbolProvider, SymbolInformation, SymbolKind, Location } from 'vscode';
 import { LanguageMiddlewareFeature } from '../omnisharp/languageMiddlewareFeature';
 import SourceGeneratedDocumentProvider from './sourceGeneratedDocumentProvider';
+import { omnisharpOptions } from '../shared/options';
 
 export default class OmniSharpWorkspaceSymbolProvider extends AbstractSupport implements WorkspaceSymbolProvider {
     constructor(
         server: OmniSharpServer,
-        private optionProvider: OptionProvider,
         languageMiddlewareFeature: LanguageMiddlewareFeature,
         private sourceGeneratedDocumentProvider: SourceGeneratedDocumentProvider
     ) {
@@ -24,9 +23,10 @@ export default class OmniSharpWorkspaceSymbolProvider extends AbstractSupport im
     }
 
     public async provideWorkspaceSymbols(search: string, token: CancellationToken): Promise<SymbolInformation[]> {
-        const options = this.optionProvider.GetLatestOptions().omnisharpOptions;
-        const minFilterLength = options.minFindSymbolsFilterLength > 0 ? options.minFindSymbolsFilterLength : undefined;
-        const maxItemsToReturn = options.maxFindSymbolsItems > 0 ? options.maxFindSymbolsItems : undefined;
+        const minFindSymbolsFilterLength = omnisharpOptions.minFindSymbolsFilterLength;
+        const maxFindSymbolsItems = omnisharpOptions.maxFindSymbolsItems;
+        const minFilterLength = minFindSymbolsFilterLength > 0 ? minFindSymbolsFilterLength : undefined;
+        const maxItemsToReturn = maxFindSymbolsItems > 0 ? maxFindSymbolsItems : undefined;
 
         if (minFilterLength !== undefined && search.length < minFilterLength) {
             return [];
diff --git a/src/json.ts b/src/json.ts
index 93804fb6d..6081c187e 100644
--- a/src/json.ts
+++ b/src/json.ts
@@ -3,212 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const enum CharCode {
-    asterisk = 0x2a, // *
-    backSlash = 0x5c, // \
-    closeBrace = 0x7d, // }
-    closeBracket = 0x5d, // ]
-    comma = 0x2c, // ,
-    doubleQuote = 0x22, // "
-    slash = 0x2f, // /
-
-    byteOrderMark = 0xfeff,
-
-    // line terminator characters (see https://en.wikipedia.org/wiki/Newline#Unicode)
-    carriageReturn = 0x0d,
-    formFeed = 0x0c,
-    lineFeed = 0x0a,
-    lineSeparator = 0x2028,
-    nextLine = 0x85,
-    paragraphSeparator = 0x2029,
-    verticalTab = 0x0b,
-
-    // whitespace characters (see https://en.wikipedia.org/wiki/Whitespace_character#Unicode)
-    tab = 0x09,
-    space = 0x20,
-    nonBreakingSpace = 0xa0,
-    ogham = 0x1680,
-    enQuad = 0x2000,
-    emQuad = 0x2001,
-    enSpace = 0x2002,
-    emSpace = 0x2003,
-    threePerEmSpace = 0x2004,
-    fourPerEmSpace = 0x2005,
-    sixPerEmSpace = 0x2006,
-    figureSpace = 0x2007,
-    punctuationSpace = 0x2008,
-    thinSpace = 0x2009,
-    hairSpace = 0x200a,
-    zeroWidthSpace = 0x200b,
-    narrowNoBreakSpace = 0x202f,
-    mathematicalSpace = 0x205f,
-    ideographicSpace = 0x3000,
-}
-
-function isLineBreak(code: number) {
-    return (
-        code === CharCode.lineFeed ||
-        code === CharCode.carriageReturn ||
-        code === CharCode.verticalTab ||
-        code === CharCode.formFeed ||
-        code === CharCode.lineSeparator ||
-        code === CharCode.paragraphSeparator
-    );
-}
-
-function isWhitespace(code: number) {
-    return (
-        code === CharCode.space ||
-        code === CharCode.tab ||
-        code === CharCode.lineFeed ||
-        code === CharCode.verticalTab ||
-        code === CharCode.formFeed ||
-        code === CharCode.carriageReturn ||
-        code === CharCode.nextLine ||
-        code === CharCode.nonBreakingSpace ||
-        code === CharCode.ogham ||
-        (code >= CharCode.enQuad && code <= CharCode.zeroWidthSpace) ||
-        code === CharCode.lineSeparator ||
-        code === CharCode.paragraphSeparator ||
-        code === CharCode.narrowNoBreakSpace ||
-        code === CharCode.mathematicalSpace ||
-        code === CharCode.ideographicSpace ||
-        code === CharCode.byteOrderMark
-    );
-}
-
-function cleanJsonText(text: string) {
-    const parts: string[] = [];
-    let partStart = 0;
-
-    let index = 0;
-    const length = text.length;
-
-    function next(): number {
-        const result = peek();
-        index++;
-        return result;
-    }
-
-    function peek(offset = 0): number {
-        return text.charCodeAt(index + offset);
-    }
-
-    function peekPastWhitespace(): number {
-        let pos = index;
-        let code = NaN;
-
-        do {
-            code = text.charCodeAt(pos);
-            pos++;
-        } while (isWhitespace(code));
-
-        return code;
-    }
-
-    function scanString() {
-        while (index < length) {
-            const code = next();
-
-            if (code === CharCode.doubleQuote) {
-                // End of string. We're done
-                break;
-            }
-
-            if (code === CharCode.backSlash) {
-                // Skip escaped character. We don't care about verifying the escape sequence.
-                // We just don't want to accidentally scan an escaped double-quote as the end of the string.
-                index++;
-            }
-
-            if (isLineBreak(code)) {
-                // string ended unexpectedly
-                break;
-            }
-        }
-    }
-
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        const code = next();
-
-        switch (code) {
-            // byte-order mark
-            case CharCode.byteOrderMark:
-                // We just skip the byte-order mark
-                parts.push(text.substring(partStart, index - 1));
-                partStart = index;
-                break;
-
-            // strings
-            case CharCode.doubleQuote:
-                scanString();
-                break;
-
-            // comments
-            case CharCode.slash:
-                // Single-line comment
-                if (peek() === CharCode.slash) {
-                    // Be careful not to include the first slash in the text part.
-                    parts.push(text.substring(partStart, index - 1));
-
-                    // Start after the second slash and scan until a line-break character is encountered.
-                    index++;
-                    while (index < length) {
-                        if (isLineBreak(peek())) {
-                            break;
-                        }
-
-                        index++;
-                    }
-
-                    partStart = index;
-                }
-
-                // Multi-line comment
-                if (peek() === CharCode.asterisk) {
-                    // Be careful not to include the first slash in the text part.
-                    parts.push(text.substring(partStart, index - 1));
-
-                    // Start after the asterisk and scan until a */ is encountered.
-                    index++;
-                    while (index < length) {
-                        if (peek() === CharCode.asterisk && peek(1) === CharCode.slash) {
-                            index += 2;
-                            break;
-                        }
-
-                        index++;
-                    }
-
-                    partStart = index;
-                }
-
-                break;
-
-            case CharCode.comma: {
-                // Ignore trailing commas in object member lists and array element lists
-                const nextCode = peekPastWhitespace();
-                if (nextCode === CharCode.closeBrace || nextCode === CharCode.closeBracket) {
-                    parts.push(text.substring(partStart, index - 1));
-                    partStart = index;
-                }
-
-                break;
-            }
-            default:
-        }
-
-        if (index >= length && index > partStart) {
-            parts.push(text.substring(partStart, length));
-            break;
-        }
-    }
-
-    return parts.join('');
-}
+import { parse } from 'jsonc-parser';
 
 export function tolerantParse(text: string) {
-    text = cleanJsonText(text);
-    return JSON.parse(text);
+    return parse(text);
 }
diff --git a/src/lsptoolshost/commands.ts b/src/lsptoolshost/commands.ts
index b70c726a3..b96c40809 100644
--- a/src/lsptoolshost/commands.ts
+++ b/src/lsptoolshost/commands.ts
@@ -10,13 +10,11 @@ import { RoslynLanguageServer } from './roslynLanguageServer';
 import { createLaunchTargetForSolution } from '../shared/launchTarget';
 import reportIssue from '../shared/reportIssue';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
-import OptionProvider from '../shared/observers/optionProvider';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 
 export function registerCommands(
     context: vscode.ExtensionContext,
     languageServer: RoslynLanguageServer,
-    optionProvider: OptionProvider,
     hostExecutableResolver: IHostExecutableResolver,
     outputChannel: vscode.OutputChannel
 ) {
@@ -31,7 +29,11 @@ export function registerCommands(
     // so we don't accidentally pass them directly into vscode APIs.
     context.subscriptions.push(vscode.commands.registerCommand('roslyn.client.peekReferences', peekReferencesCallback));
     context.subscriptions.push(
-        vscode.commands.registerCommand('roslyn.client.completionComplexEdit', completionComplexEdit)
+        vscode.commands.registerCommand(
+            'roslyn.client.completionComplexEdit',
+            async (uriStr, textEdit, isSnippetString, newOffset) =>
+                completionComplexEdit(uriStr, textEdit, isSnippetString, newOffset, outputChannel)
+        )
     );
     context.subscriptions.push(
         vscode.commands.registerCommand('dotnet.restartServer', async () => restartServer(languageServer))
@@ -42,11 +44,9 @@ export function registerCommands(
     context.subscriptions.push(
         vscode.commands.registerCommand('csharp.reportIssue', async () =>
             reportIssue(
-                vscode,
                 context.extension.packageJSON.version,
                 getDotnetInfo,
                 /*shouldIncludeMonoInfo:*/ false,
-                optionProvider.GetLatestOptions(),
                 hostExecutableResolver
             )
         )
@@ -99,11 +99,14 @@ async function completionComplexEdit(
     uriStr: string,
     textEdit: vscode.TextEdit,
     isSnippetString: boolean,
-    newOffset: number
+    newOffset: number,
+    outputChannel: vscode.OutputChannel
 ): Promise<void> {
     let success = false;
     const uri = UriConverter.deserialize(uriStr);
-    const editor = vscode.window.visibleTextEditors.find((editor) => editor.document.uri.path === uri.path);
+    const editor = vscode.window.visibleTextEditors.find(
+        (editor) => editor.document.uri.path === uri.path || editor.document.uri.fsPath === uri.fsPath
+    );
 
     if (editor !== undefined) {
         const newRange = editor.document.validateRange(
@@ -142,7 +145,29 @@ async function completionComplexEdit(
     }
 
     if (!success) {
-        throw new Error('Failed to make a complex text edit for completion.');
+        const componentName = '[roslyn.client.completionComplexEdit]';
+        const errorMessage = 'Failed to make a complex text edit for completion.';
+        outputChannel.show();
+        outputChannel.appendLine(`${componentName} ${errorMessage}`);
+
+        if (editor === undefined) {
+            outputChannel.appendLine(
+                `${componentName} Can't find visible document with uri.fsPath: '${uri.fsPath}' and uri.path: '${uri.path}'`
+            );
+
+            outputChannel.appendLine(`${componentName} URIs of all visible documents:`);
+            for (const visibleEditor of vscode.window.visibleTextEditors) {
+                outputChannel.appendLine(
+                    `${componentName} - uri.fsPath: '${visibleEditor.document.uri.fsPath}' and uri.path: '${visibleEditor.document.uri.path}'`
+                );
+            }
+        } else {
+            outputChannel.appendLine(
+                `${componentName} ${isSnippetString ? 'TextEditor.insertSnippet' : 'workspace.applyEdit'} failed.`
+            );
+        }
+
+        throw new Error(`${componentName} ${errorMessage}`);
     }
 }
 
diff --git a/src/lsptoolshost/debugger.ts b/src/lsptoolshost/debugger.ts
index 5c7bbc705..afae73b7f 100644
--- a/src/lsptoolshost/debugger.ts
+++ b/src/lsptoolshost/debugger.ts
@@ -10,22 +10,22 @@ import { IWorkspaceDebugInformationProvider } from '../shared/IWorkspaceDebugInf
 import { RoslynLanguageServer } from './roslynLanguageServer';
 import { RoslynWorkspaceDebugInformationProvider } from './roslynWorkspaceDebugConfigurationProvider';
 import { PlatformInformation } from '../shared/platform';
-import OptionProvider from '../shared/observers/optionProvider';
 import { ServerStateChange } from './serverStateChange';
 import { DotnetConfigurationResolver } from '../shared/dotnetConfigurationProvider';
 import { getCSharpDevKit } from '../utils/getCSharpDevKit';
+import { RoslynLanguageServerEvents } from './languageServerEvents';
 
 export function registerDebugger(
     context: vscode.ExtensionContext,
     languageServer: RoslynLanguageServer,
+    languageServerEvents: RoslynLanguageServerEvents,
     platformInfo: PlatformInformation,
-    optionProvider: OptionProvider,
     csharpOutputChannel: vscode.OutputChannel
 ) {
     const workspaceInformationProvider: IWorkspaceDebugInformationProvider =
-        new RoslynWorkspaceDebugInformationProvider(languageServer);
+        new RoslynWorkspaceDebugInformationProvider(languageServer, csharpOutputChannel);
 
-    const disposable = languageServer.registerStateChangeEvent(async (state) => {
+    const disposable = languageServerEvents.onServerStateChange(async (state) => {
         if (state === ServerStateChange.ProjectInitializationComplete) {
             const csharpDevkitExtension = getCSharpDevKit();
             if (!csharpDevkitExtension) {
@@ -39,7 +39,6 @@ export function registerDebugger(
     const dotnetWorkspaceConfigurationProvider = new DotnetWorkspaceConfigurationProvider(
         workspaceInformationProvider,
         platformInfo,
-        optionProvider,
         csharpOutputChannel
     );
 
diff --git a/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts b/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts
index 7039ef8c5..634155b4c 100644
--- a/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts
+++ b/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts
@@ -9,13 +9,12 @@ import * as semver from 'semver';
 import { HostExecutableInformation } from '../shared/constants/hostExecutableInformation';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 import { PlatformInformation } from '../shared/platform';
-import { Options } from '../shared/options';
+import { commonOptions } from '../shared/options';
 import { existsSync } from 'fs';
 import { CSharpExtensionId } from '../constants/csharpExtensionId';
-import { promisify } from 'util';
-import { exec } from 'child_process';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
-import { readFile, realpath } from 'fs/promises';
+import { readFile } from 'fs/promises';
+import { RuntimeInfo } from '../shared/utils/dotnetInfo';
 
 export const DotNetRuntimeVersion = '7.0';
 
@@ -33,16 +32,16 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
         /**
          * This is a function instead of a string because the server path can change while the extension is active (when the option changes).
          */
-        private getServerPath: (options: Options, platform: PlatformInformation) => string,
+        private getServerPath: (platform: PlatformInformation) => string,
         private channel: vscode.OutputChannel,
         private extensionPath: string
     ) {}
 
     private hostInfo: HostExecutableInformation | undefined;
 
-    async getHostExecutableInfo(options: Options): Promise<HostExecutableInformation> {
-        let dotnetRuntimePath = options.commonOptions.dotnetPath;
-        const serverPath = this.getServerPath(options, this.platformInfo);
+    async getHostExecutableInfo(): Promise<HostExecutableInformation> {
+        let dotnetRuntimePath = commonOptions.dotnetPath;
+        const serverPath = this.getServerPath(this.platformInfo);
 
         // Check if we can find a valid dotnet from dotnet --version on the PATH.
         if (!dotnetRuntimePath) {
@@ -62,7 +61,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
             dotnetRuntimePath = path.dirname(dotnetInfo.path);
         }
 
-        const dotnetExecutableName = this.platformInfo.isWindows() ? 'dotnet.exe' : 'dotnet';
+        const dotnetExecutableName = this.getDotnetExecutableName();
         const dotnetExecutablePath = path.join(dotnetRuntimePath, dotnetExecutableName);
         if (!existsSync(dotnetExecutablePath)) {
             throw new Error(`Cannot find dotnet path '${dotnetExecutablePath}'`);
@@ -151,39 +150,40 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
             }
 
             const coreRuntimeVersions = dotnetInfo.Runtimes['Microsoft.NETCore.App'];
-            let foundRuntimeVersion = false;
-            for (const version of coreRuntimeVersions) {
+            let matchingRuntime: RuntimeInfo | undefined = undefined;
+            for (const runtime of coreRuntimeVersions) {
                 // We consider a match if the runtime is greater than or equal to the required version since we roll forward.
-                if (semver.gt(version, requiredRuntimeVersion)) {
-                    foundRuntimeVersion = true;
+                if (semver.gt(runtime.Version, requiredRuntimeVersion)) {
+                    matchingRuntime = runtime;
                     break;
                 }
             }
 
-            if (!foundRuntimeVersion) {
+            if (!matchingRuntime) {
                 throw new Error(
                     `No compatible .NET runtime found. Minimum required version is ${this.minimumDotnetRuntimeVersion}.`
                 );
             }
 
-            // Find the location of the dotnet on path.
-            const command = this.platformInfo.isWindows() ? 'where' : 'which';
-            const whereOutput = await promisify(exec)(`${command} dotnet`);
-            if (!whereOutput.stdout) {
-                throw new Error(`Unable to find dotnet from ${command}.`);
-            }
-
-            // There could be multiple paths output from where.  Take the first since that is what we used to run dotnet --info.
-            const path = whereOutput.stdout.trim().replace(/\r/gm, '').split('\n')[0];
-            if (!existsSync(path)) {
-                throw new Error(`dotnet path does not exist: ${path}`);
+            // The .NET install layout is a well known structure on all platforms.
+            // See https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#net-core-install-layout
+            //
+            // Therefore we know that the runtime path is always in <install root>/shared/<runtime name>
+            // and the dotnet executable is always at <install root>/dotnet(.exe).
+            //
+            // Since dotnet --list-runtimes will always use the real assembly path to output the runtime folder (no symlinks!)
+            // we know the dotnet executable will be two folders up in the install root.
+            const runtimeFolderPath = matchingRuntime.Path;
+            const installFolder = path.dirname(path.dirname(runtimeFolderPath));
+            const dotnetExecutablePath = path.join(installFolder, this.getDotnetExecutableName());
+            if (!existsSync(dotnetExecutablePath)) {
+                throw new Error(
+                    `dotnet executable path does not exist: ${dotnetExecutablePath}, dotnet installation may be corrupt.`
+                );
             }
 
             this.channel.appendLine(`Using dotnet configured on PATH`);
-
-            // If dotnet is just a symlink, resolve it to the actual executable so
-            // callers will be able to get the actual directory containing the exe.
-            return await realpath(path);
+            return dotnetExecutablePath;
         } catch (e) {
             this.channel.appendLine(
                 'Failed to find dotnet info from path, falling back to acquire runtime via ms-dotnettools.vscode-dotnet-runtime'
@@ -236,4 +236,8 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
                 throw new Error(`Unknown extension target platform: ${targetPlatform}`);
         }
     }
+
+    private getDotnetExecutableName(): string {
+        return this.platformInfo.isWindows() ? 'dotnet.exe' : 'dotnet';
+    }
 }
diff --git a/src/lsptoolshost/fixAllCodeAction.ts b/src/lsptoolshost/fixAllCodeAction.ts
new file mode 100644
index 000000000..aa133d73a
--- /dev/null
+++ b/src/lsptoolshost/fixAllCodeAction.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as RoslynProtocol from './roslynProtocol';
+import { LSPAny } from 'vscode-languageserver-protocol';
+import { RoslynLanguageServer } from './roslynLanguageServer';
+import { URIConverter, createConverter } from 'vscode-languageclient/lib/common/protocolConverter';
+import { UriConverter } from './uriConverter';
+
+export function registerCodeActionFixAllCommands(
+    context: vscode.ExtensionContext,
+    languageServer: RoslynLanguageServer,
+    outputChannel: vscode.OutputChannel
+) {
+    context.subscriptions.push(
+        vscode.commands.registerCommand(
+            'roslyn.client.fixAllCodeAction',
+            async (request): Promise<void> => registerFixAllResolveCodeAction(languageServer, request, outputChannel)
+        )
+    );
+}
+
+async function registerFixAllResolveCodeAction(
+    languageServer: RoslynLanguageServer,
+    codeActionData: any,
+    outputChannel: vscode.OutputChannel
+) {
+    if (codeActionData) {
+        const data = <LSPAny>codeActionData;
+        const result = await vscode.window.showQuickPick(data.FixAllFlavors, {
+            placeHolder: vscode.l10n.t('Pick a fix all scope'),
+        });
+
+        await vscode.window.withProgress(
+            {
+                location: vscode.ProgressLocation.Notification,
+                title: vscode.l10n.t('Fix All Code Action'),
+                cancellable: true,
+            },
+            async (_, token) => {
+                if (result) {
+                    const fixAllCodeAction: RoslynProtocol.RoslynFixAllCodeAction = {
+                        title: data.UniqueIdentifier,
+                        data: data,
+                        scope: result,
+                    };
+
+                    const response = await languageServer.sendRequest(
+                        RoslynProtocol.CodeActionFixAllResolveRequest.type,
+                        fixAllCodeAction,
+                        token
+                    );
+
+                    if (response.edit) {
+                        const uriConverter: URIConverter = (value: string): vscode.Uri =>
+                            UriConverter.deserialize(value);
+                        const protocolConverter = createConverter(uriConverter, true, true);
+                        const fixAllEdit = await protocolConverter.asWorkspaceEdit(response.edit);
+                        if (!(await vscode.workspace.applyEdit(fixAllEdit))) {
+                            const componentName = '[roslyn.client.fixAllCodeAction]';
+                            const errorMessage = 'Failed to make a fix all edit for completion.';
+                            outputChannel.show();
+                            outputChannel.appendLine(`${componentName} ${errorMessage}`);
+                            throw new Error('Tried to insert multiple code action edits, but an error occurred.');
+                        }
+                    }
+                }
+            }
+        );
+    }
+}
diff --git a/src/lsptoolshost/languageServerEvents.ts b/src/lsptoolshost/languageServerEvents.ts
new file mode 100644
index 000000000..ded1687a2
--- /dev/null
+++ b/src/lsptoolshost/languageServerEvents.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { ServerStateChange } from './serverStateChange';
+import { IDisposable } from '../disposable';
+
+/**
+ * Defines events that are fired by the language server.
+ * These events can be consumed to wait for the server to reach a certain state.
+ */
+export interface LanguageServerEvents {
+    readonly onServerStateChange: vscode.Event<ServerStateChange>;
+}
+
+/**
+ * Implementation that fires events when the language server reaches a certain state.
+ * This is intentionally separate from the language server itself, so consumers can
+ * register for events without having to know about the specific current state of the language server.
+ */
+export class RoslynLanguageServerEvents implements LanguageServerEvents, IDisposable {
+    public readonly onServerStateChangeEmitter = new vscode.EventEmitter<ServerStateChange>();
+
+    public get onServerStateChange(): vscode.Event<ServerStateChange> {
+        return this.onServerStateChangeEmitter.event;
+    }
+
+    dispose(): void {
+        this.onServerStateChangeEmitter.dispose();
+    }
+}
diff --git a/src/lsptoolshost/onAutoInsert.ts b/src/lsptoolshost/onAutoInsert.ts
new file mode 100644
index 000000000..538281bb6
--- /dev/null
+++ b/src/lsptoolshost/onAutoInsert.ts
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { UriConverter } from './uriConverter';
+
+import { FormattingOptions, TextDocumentIdentifier } from 'vscode-languageclient/node';
+import * as RoslynProtocol from './roslynProtocol';
+import { RoslynLanguageServer } from './roslynLanguageServer';
+import { languageServerOptions } from '../shared/options';
+
+export function registerOnAutoInsert(languageServer: RoslynLanguageServer) {
+    let source = new vscode.CancellationTokenSource();
+    vscode.workspace.onDidChangeTextDocument(async (e) => {
+        if (!languageServerOptions.documentSelector.includes(e.document.languageId)) {
+            return;
+        }
+
+        if (e.contentChanges.length > 1 || e.contentChanges.length === 0) {
+            return;
+        }
+
+        const change = e.contentChanges[0];
+
+        if (!change.range.isEmpty) {
+            return;
+        }
+
+        const capabilities = await languageServer.getServerCapabilities();
+
+        if (capabilities._vs_onAutoInsertProvider) {
+            // Regular expression to match all whitespace characters except the newline character
+            const changeTrimmed = change.text.replace(/[^\S\n]+/g, '');
+
+            if (!capabilities._vs_onAutoInsertProvider._vs_triggerCharacters.includes(changeTrimmed)) {
+                return;
+            }
+
+            source.cancel();
+            source = new vscode.CancellationTokenSource();
+            await applyAutoInsertEdit(e, changeTrimmed, languageServer, source.token);
+        }
+    });
+}
+
+async function applyAutoInsertEdit(
+    e: vscode.TextDocumentChangeEvent,
+    changeTrimmed: string,
+    languageServer: RoslynLanguageServer,
+    token: vscode.CancellationToken
+) {
+    const change = e.contentChanges[0];
+    // The server expects the request position to represent the caret position in the text after the change has already been applied.
+    // We need to calculate what that position would be after the change is applied and send that to the server.
+    const position = new vscode.Position(
+        change.range.start.line,
+        change.range.start.character + (change.text.length - change.rangeLength)
+    );
+    const uri = UriConverter.serialize(e.document.uri);
+    const textDocument = TextDocumentIdentifier.create(uri);
+    const formattingOptions = getFormattingOptions();
+    const request: RoslynProtocol.OnAutoInsertParams = {
+        _vs_textDocument: textDocument,
+        _vs_position: position,
+        _vs_ch: changeTrimmed,
+        _vs_options: formattingOptions,
+    };
+
+    const response = await languageServer.sendRequest(RoslynProtocol.OnAutoInsertRequest.type, request, token);
+    if (response) {
+        const textEdit = response._vs_textEdit;
+        const startPosition = new vscode.Position(textEdit.range.start.line, textEdit.range.start.character);
+        const endPosition = new vscode.Position(textEdit.range.end.line, textEdit.range.end.character);
+        const docComment = new vscode.SnippetString(textEdit.newText);
+        const code: any = vscode;
+        const textEdits = [new code.SnippetTextEdit(new vscode.Range(startPosition, endPosition), docComment)];
+        const edit = new vscode.WorkspaceEdit();
+        edit.set(e.document.uri, textEdits);
+
+        const applied = vscode.workspace.applyEdit(edit);
+        if (!applied) {
+            throw new Error('Tried to insert a comment but an error occurred.');
+        }
+    }
+}
+
+function getFormattingOptions(): FormattingOptions {
+    const editorConfig = vscode.workspace.getConfiguration('editor');
+    const tabSize = editorConfig.get<number>('tabSize') ?? 4;
+    const insertSpaces = editorConfig.get<boolean>('insertSpaces') ?? true;
+    return FormattingOptions.create(tabSize, insertSpaces);
+}
diff --git a/src/lsptoolshost/optionChanges.ts b/src/lsptoolshost/optionChanges.ts
index dced750d3..e71fe24ac 100644
--- a/src/lsptoolshost/optionChanges.ts
+++ b/src/lsptoolshost/optionChanges.ts
@@ -5,12 +5,12 @@
 
 import * as vscode from 'vscode';
 import { Observable } from 'rxjs';
-import { CommonOptionsThatTriggerReload, LanguageServerOptionsThatTriggerReload, Options } from '../shared/options';
+import { CommonOptionsThatTriggerReload, LanguageServerOptionsThatTriggerReload } from '../shared/options';
 import { HandleOptionChanges, OptionChangeObserver, OptionChanges } from '../shared/observers/optionChangeObserver';
 import ShowInformationMessage from '../shared/observers/utils/showInformationMessage';
 import Disposable from '../disposable';
 
-export function registerLanguageServerOptionChanges(optionObservable: Observable<Options>): Disposable {
+export function registerLanguageServerOptionChanges(optionObservable: Observable<void>): Disposable {
     const optionChangeObserver: OptionChangeObserver = {
         getRelevantOptions: () => {
             return {
diff --git a/src/lsptoolshost/razorCommands.ts b/src/lsptoolshost/razorCommands.ts
new file mode 100644
index 000000000..52495bb8a
--- /dev/null
+++ b/src/lsptoolshost/razorCommands.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RoslynLanguageServer } from './roslynLanguageServer';
+import * as vscode from 'vscode';
+import {
+    DidChangeTextDocumentNotification,
+    DidCloseTextDocumentNotification,
+    DidCloseTextDocumentParams,
+    DidChangeTextDocumentParams,
+    DocumentDiagnosticParams,
+    RequestType,
+    DocumentDiagnosticRequest,
+    DocumentDiagnosticReport,
+    CancellationToken,
+    CodeAction,
+    CodeActionParams,
+    CodeActionRequest,
+    CodeActionResolveRequest,
+    CompletionParams,
+    CompletionRequest,
+    CompletionResolveRequest,
+    CompletionItem,
+} from 'vscode-languageclient/node';
+import SerializableSimplifyMethodParams from '../razor/src/simplify/serializableSimplifyMethodParams';
+import { TextEdit } from 'vscode-html-languageservice';
+import { SerializableFormatNewFileParams } from '../razor/src/formatNewFile/serializableFormatNewFileParams';
+
+// These are commands that are invoked by the Razor extension, and are used to send LSP requests to the Roslyn LSP server
+export const roslynDidChangeCommand = 'roslyn.changeRazorCSharp';
+export const roslynDidCloseCommand = 'roslyn.closeRazorCSharp';
+export const roslynPullDiagnosticCommand = 'roslyn.pullDiagnosticRazorCSharp';
+export const provideCodeActionsCommand = 'roslyn.provideCodeActions';
+export const resolveCodeActionCommand = 'roslyn.resolveCodeAction';
+export const provideCompletionsCommand = 'roslyn.provideCompletions';
+export const resolveCompletionsCommand = 'roslyn.resolveCompletion';
+export const provideSemanticTokensRangeCommand = 'roslyn.provideSemanticTokensRange';
+export const roslynSimplifyMethodCommand = 'roslyn.simplifyMethod';
+export const roslynFormatNewFileCommand = 'roslyn.formatNewFile';
+export const razorInitializeCommand = 'razor.initialize';
+
+export function registerRazorCommands(context: vscode.ExtensionContext, languageServer: RoslynLanguageServer) {
+    // Razor will call into us (via command) for generated file didChange/didClose notifications. We'll then forward these
+    // notifications along to Roslyn. didOpen notifications are handled separately via the vscode.openTextDocument method.
+    context.subscriptions.push(
+        vscode.commands.registerCommand(roslynDidChangeCommand, async (notification: DidChangeTextDocumentParams) => {
+            await languageServer.sendNotification(DidChangeTextDocumentNotification.method, notification);
+        })
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand(roslynDidCloseCommand, async (notification: DidCloseTextDocumentParams) => {
+            await languageServer.sendNotification(DidCloseTextDocumentNotification.method, notification);
+        })
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand(roslynPullDiagnosticCommand, async (request: DocumentDiagnosticParams) => {
+            const diagnosticRequestType = new RequestType<DocumentDiagnosticParams, DocumentDiagnosticReport, any>(
+                DocumentDiagnosticRequest.method
+            );
+            return await languageServer.sendRequest(diagnosticRequestType, request, CancellationToken.None);
+        })
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand(
+            roslynSimplifyMethodCommand,
+            async (request: SerializableSimplifyMethodParams) => {
+                const simplifyMethodRequestType = new RequestType<SerializableSimplifyMethodParams, TextEdit[], any>(
+                    'roslyn/simplifyMethod'
+                );
+                return await languageServer.sendRequest(simplifyMethodRequestType, request, CancellationToken.None);
+            }
+        )
+    );
+
+    const formatNewFileRequestType = new RequestType<SerializableFormatNewFileParams, string | undefined, any>(
+        'roslyn/formatNewFile'
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand(
+            roslynFormatNewFileCommand,
+            async (request: SerializableFormatNewFileParams) => {
+                return await languageServer.sendRequest(formatNewFileRequestType, request, CancellationToken.None);
+            }
+        )
+    );
+
+    // The VS Code API for code actions (and the vscode.CodeAction type) doesn't support everything that LSP supports,
+    // namely the data property, which Razor needs to identify which code actions are on their allow list, so we need
+    // to expose a command for them to directly invoke our code actions LSP endpoints, rather than use built-in commands.
+    context.subscriptions.push(
+        vscode.commands.registerCommand(provideCodeActionsCommand, async (request: CodeActionParams) => {
+            return await languageServer.sendRequest(CodeActionRequest.type, request, CancellationToken.None);
+        })
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand(resolveCodeActionCommand, async (request: CodeAction) => {
+            return await languageServer.sendRequest(CodeActionResolveRequest.type, request, CancellationToken.None);
+        })
+    );
+
+    context.subscriptions.push(
+        vscode.commands.registerCommand(provideCompletionsCommand, async (request: CompletionParams) => {
+            return await languageServer.sendRequest(CompletionRequest.type, request, CancellationToken.None);
+        })
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand(resolveCompletionsCommand, async (request: CompletionItem) => {
+            return await languageServer.sendRequest(CompletionResolveRequest.type, request, CancellationToken.None);
+        })
+    );
+
+    // Roslyn is responsible for producing a json file containing information for Razor, that comes from the compilation for
+    // a project. We want to defer this work until necessary, so this command is called by the Razor document manager to tell
+    // us when they need us to initialize the Razor things.
+    context.subscriptions.push(
+        vscode.commands.registerCommand(razorInitializeCommand, async () => {
+            await languageServer.sendNotification('razor/initialize', {});
+        })
+    );
+}
diff --git a/src/lsptoolshost/roslynLanguageServer.ts b/src/lsptoolshost/roslynLanguageServer.ts
index 24d7928bd..152cedd67 100644
--- a/src/lsptoolshost/roslynLanguageServer.ts
+++ b/src/lsptoolshost/roslynLanguageServer.ts
@@ -8,50 +8,32 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as cp from 'child_process';
 import * as uuid from 'uuid';
+import * as net from 'net';
 import { registerCommands } from './commands';
 import { registerDebugger } from './debugger';
 import { UriConverter } from './uriConverter';
 
 import {
-    DidChangeTextDocumentNotification,
-    DidCloseTextDocumentNotification,
     LanguageClientOptions,
     ServerOptions,
-    DidCloseTextDocumentParams,
-    DidChangeTextDocumentParams,
-    DocumentDiagnosticParams,
     State,
     Trace,
     RequestType,
     RequestType0,
-    FormattingOptions,
-    TextDocumentIdentifier,
-    DocumentDiagnosticRequest,
-    DocumentDiagnosticReport,
-    CancellationToken,
-    CodeAction,
-    CodeActionParams,
-    CodeActionRequest,
-    CodeActionResolveRequest,
-    CompletionParams,
-    CompletionRequest,
-    CompletionResolveRequest,
-    CompletionItem,
     PartialResultParams,
     ProtocolRequestType,
-    MessageType,
+    SocketMessageWriter,
+    SocketMessageReader,
+    MessageTransports,
+    RAL,
 } from 'vscode-languageclient/node';
 import { PlatformInformation } from '../shared/platform';
 import { readConfigurations } from './configurationMiddleware';
-import OptionProvider from '../shared/observers/optionProvider';
 import { DynamicFileInfoHandler } from '../razor/src/dynamicFile/dynamicFileInfoHandler';
 import ShowInformationMessage from '../shared/observers/utils/showInformationMessage';
-import EventEmitter = require('events');
-import Disposable from '../disposable';
 import * as RoslynProtocol from './roslynProtocol';
 import { CSharpDevKitExports } from '../csharpDevKitExports';
-import { ISolutionSnapshotProvider, SolutionSnapshotId } from './services/ISolutionSnapshotProvider';
-import { Options } from '../shared/options';
+import { SolutionSnapshotId } from './services/ISolutionSnapshotProvider';
 import { ServerStateChange } from './serverStateChange';
 import CSharpIntelliCodeExports from '../csharpIntelliCodeExports';
 import { csharpDevkitExtensionId, csharpDevkitIntelliCodeExtensionId, getCSharpDevKit } from '../utils/getCSharpDevKit';
@@ -60,58 +42,46 @@ import { DotnetRuntimeExtensionResolver } from './dotnetRuntimeExtensionResolver
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 import { RoslynLanguageClient } from './roslynLanguageClient';
 import { registerUnitTestingCommands } from './unitTesting';
-import SerializableSimplifyMethodParams from '../razor/src/simplify/serializableSimplifyMethodParams';
-import { TextEdit } from 'vscode-html-languageservice';
+import { reportProjectConfigurationEvent } from '../shared/projectConfiguration';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
 import { registerLanguageServerOptionChanges } from './optionChanges';
 import { Observable } from 'rxjs';
 import { DotnetInfo } from '../shared/utils/dotnetInfo';
+import { RoslynLanguageServerEvents } from './languageServerEvents';
+import { registerShowToastNotification } from './showToastNotification';
+import { registerRazorCommands } from './razorCommands';
+import { registerOnAutoInsert } from './onAutoInsert';
+import { registerCodeActionFixAllCommands } from './fixAllCodeAction';
+import { commonOptions, languageServerOptions, omnisharpOptions } from '../shared/options';
+import { NamedPipeInformation } from './roslynProtocol';
+import { IDisposable } from '../disposable';
 
-let _languageServer: RoslynLanguageServer;
 let _channel: vscode.OutputChannel;
 let _traceChannel: vscode.OutputChannel;
 
-export class RoslynLanguageServer {
-    // These are commands that are invoked by the Razor extension, and are used to send LSP requests to the Roslyn LSP server
-    public static readonly roslynDidOpenCommand: string = 'roslyn.openRazorCSharp';
-    public static readonly roslynDidChangeCommand: string = 'roslyn.changeRazorCSharp';
-    public static readonly roslynDidCloseCommand: string = 'roslyn.closeRazorCSharp';
-    public static readonly roslynPullDiagnosticCommand: string = 'roslyn.pullDiagnosticRazorCSharp';
-    public static readonly provideCodeActionsCommand: string = 'roslyn.provideCodeActions';
-    public static readonly resolveCodeActionCommand: string = 'roslyn.resolveCodeAction';
-    public static readonly provideCompletionsCommand: string = 'roslyn.provideCompletions';
-    public static readonly resolveCompletionsCommand: string = 'roslyn.resolveCompletion';
-    public static readonly roslynSimplifyMethodCommand: string = 'roslyn.simplifyMethod';
-    public static readonly razorInitializeCommand: string = 'razor.initialize';
+// Flag indicating if C# Devkit was installed the last time we activated.
+// Used to determine if we need to restart the server on extension changes.
+let _wasActivatedWithCSharpDevkit: boolean | undefined;
 
+export class RoslynLanguageServer {
     // These are notifications we will get from the LSP server and will forward to the Razor extension.
     private static readonly provideRazorDynamicFileInfoMethodName: string = 'razor/provideDynamicFileInfo';
     private static readonly removeRazorDynamicFileInfoMethodName: string = 'razor/removeDynamicFileInfo';
 
     /**
-     * Event name used to fire events to the _eventBus when the server state changes.
+     * The encoding to use when writing to and from the stream.
      */
-    private static readonly serverStateChangeEvent: string = 'serverStateChange';
-
-    /**
-     * The timeout for stopping the language server (in ms).
-     */
-    private static _stopTimeout = 10000;
-    private _languageClient: RoslynLanguageClient | undefined;
+    private static readonly encoding: RAL.MessageBufferEncoding = 'utf-8';
 
     /**
-     * Flag indicating if C# Devkit was installed the last time we activated.
-     * Used to determine if we need to restart the server on extension changes.
+     * The regular expression used to find the named pipe key in the LSP server's stdout stream.
      */
-    private _wasActivatedWithCSharpDevkit: boolean | undefined;
+    private static readonly namedPipeKeyRegex = /{"pipeName":"[^"]+"}/;
 
     /**
-     * Event emitter that fires events when state related to the server changes.
-     * For example when the server starts or stops.
-     *
-     * Consumers can register to listen for these events if they need to.
+     * The timeout for stopping the language server (in ms).
      */
-    private _eventBus = new EventEmitter();
+    private static _stopTimeout = 10000;
 
     /**
      * The solution file previously opened; we hold onto this so we can send this back over if the server were to be relaunched for any reason, like some other configuration
@@ -124,27 +94,96 @@ export class RoslynLanguageServer {
     private _projectFiles: vscode.Uri[] = new Array<vscode.Uri>();
 
     constructor(
-        private platformInfo: PlatformInformation,
-        private hostExecutableResolver: IHostExecutableResolver,
-        private optionProvider: OptionProvider,
-        private context: vscode.ExtensionContext,
-        private additionalExtensionPaths: string[]
-    ) {}
+        private _languageClient: RoslynLanguageClient,
+        private _platformInfo: PlatformInformation,
+        private _context: vscode.ExtensionContext,
+        private _languageServerEvents: RoslynLanguageServerEvents
+    ) {
+        this.registerSetTrace();
+        this.registerSendOpenSolution();
+        this.registerOnProjectInitializationComplete();
+        this.registerReportProjectConfiguration();
+        this.registerExtensionsChanged();
+        this.registerTelemetryChanged();
+
+        // Register Razor dynamic file info handling
+        this.registerDynamicFileInfo();
+
+        this.registerDebuggerAttach();
+
+        registerShowToastNotification(this._languageClient);
+    }
+
+    private registerSetTrace() {
+        // Set the language client trace level based on the log level option.
+        // setTrace only works after the client is already running.
+        this._languageClient.onDidChangeState(async (state) => {
+            if (state.newState === State.Running) {
+                const languageClientTraceLevel = RoslynLanguageServer.GetTraceLevel(languageServerOptions.logLevel);
+
+                await this._languageClient.setTrace(languageClientTraceLevel);
+            }
+        });
+    }
+
+    private registerSendOpenSolution() {
+        this._languageClient.onDidChangeState(async (state) => {
+            if (state.newState === State.Running) {
+                if (this._solutionFile || this._projectFiles.length > 0) {
+                    await this.sendOpenSolutionAndProjectsNotifications();
+                } else {
+                    await this.openDefaultSolutionOrProjects();
+                }
+                await this.sendOrSubscribeForServiceBrokerConnection();
+                this._languageServerEvents.onServerStateChangeEmitter.fire(ServerStateChange.Started);
+            }
+        });
+    }
+
+    private registerOnProjectInitializationComplete() {
+        this._languageClient.onNotification(RoslynProtocol.ProjectInitializationCompleteNotification.type, () => {
+            this._languageServerEvents.onServerStateChangeEmitter.fire(ServerStateChange.ProjectInitializationComplete);
+        });
+    }
+
+    private registerReportProjectConfiguration() {
+        // Store the dotnet info outside of the notification so we're not running dotnet --info every time the project changes.
+        let dotnetInfo: DotnetInfo | undefined = undefined;
+        this._languageClient.onNotification(RoslynProtocol.ProjectConfigurationNotification.type, async (params) => {
+            if (!dotnetInfo) {
+                dotnetInfo = await getDotnetInfo([]);
+            }
+            reportProjectConfigurationEvent(
+                params,
+                this._platformInfo,
+                dotnetInfo,
+                this._solutionFile?.fsPath,
+                true
+            );
+        });
+    }
 
     /**
-     * Resolves server options and starts the dotnet language server process. The process is started asynchronously and this method will not wait until
-     * the process is launched.
+     * Resolves server options and starts the dotnet language server process.
+     * This promise will complete when the server starts.
      */
-    public async start(): Promise<void> {
-        const options = this.optionProvider.GetLatestOptions();
-        const logLevel = options.languageServerOptions.logLevel;
-        const languageClientTraceLevel = this.GetTraceLevel(logLevel);
-
+    public static async initializeAsync(
+        platformInfo: PlatformInformation,
+        hostExecutableResolver: IHostExecutableResolver,
+        context: vscode.ExtensionContext,
+        additionalExtensionPaths: string[],
+        languageServerEvents: RoslynLanguageServerEvents
+    ): Promise<RoslynLanguageServer> {
         const serverOptions: ServerOptions = async () => {
-            return await this.startServer(logLevel);
+            return await this.startServer(
+                platformInfo,
+                hostExecutableResolver,
+                context,
+                additionalExtensionPaths
+            );
         };
 
-        const documentSelector = options.languageServerOptions.documentSelector;
+        const documentSelector = languageServerOptions.documentSelector;
 
         // Options to control the language client
         const clientOptions: LanguageClientOptions = {
@@ -181,134 +220,26 @@ export class RoslynLanguageServer {
 
         client.registerProposedFeatures();
 
-        this._languageClient = client;
-
-        // Set the language client trace level based on the log level option.
-        // setTrace only works after the client is already running.
-        // We don't use registerOnStateChange here because we need to access the actual _languageClient instance.
-        this._languageClient.onDidChangeState(async (state) => {
-            if (state.newState === State.Running) {
-                await this._languageClient!.setTrace(languageClientTraceLevel);
-                if (this._solutionFile || this._projectFiles.length > 0) {
-                    await this.sendOpenSolutionAndProjectsNotifications();
-                } else {
-                    await this.openDefaultSolutionOrProjects();
-                }
-                await this.sendOrSubscribeForServiceBrokerConnection();
-                this._eventBus.emit(RoslynLanguageServer.serverStateChangeEvent, ServerStateChange.Started);
-            }
-        });
-
-        this._languageClient.onNotification(RoslynProtocol.ProjectInitializationCompleteNotification.type, () => {
-            this._eventBus.emit(
-                RoslynLanguageServer.serverStateChangeEvent,
-                ServerStateChange.ProjectInitializationComplete
-            );
-        });
+        const server = new RoslynLanguageServer(client, platformInfo, context, languageServerEvents);
 
-        // Store the dotnet info outside of the notification so we're not running dotnet --info every time the project changes.
-        let dotnetInfo: DotnetInfo | undefined = undefined;
-        this._languageClient.onNotification(RoslynProtocol.ProjectConfigurationNotification.type, async (_) => {
-            if (!dotnetInfo) {
-                dotnetInfo = await getDotnetInfo([]);
-            }
-        });
-
-        this._languageClient.onNotification(RoslynProtocol.ShowToastNotification.type, async (notification) => {
-            const messageOptions: vscode.MessageOptions = {
-                modal: false,
-            };
-            const commands = notification.commands.map((command) => command.title);
-            const executeCommandByName = async (result: string | undefined) => {
-                if (result) {
-                    const command = notification.commands.find((command) => command.title === result);
-                    if (!command) {
-                        throw new Error(`Unknown command ${result}`);
-                    }
-
-                    if (command.arguments) {
-                        await vscode.commands.executeCommand(command.command, ...command.arguments);
-                    } else {
-                        await vscode.commands.executeCommand(command.command);
-                    }
-                }
-            };
-
-            switch (notification.messageType) {
-                case MessageType.Error: {
-                    const result = await vscode.window.showErrorMessage(
-                        notification.message,
-                        messageOptions,
-                        ...commands
-                    );
-                    executeCommandByName(result);
-                    break;
-                }
-                case MessageType.Warning: {
-                    const result = await vscode.window.showWarningMessage(
-                        notification.message,
-                        messageOptions,
-                        ...commands
-                    );
-                    executeCommandByName(result);
-                    break;
-                }
-                default: {
-                    const result = await vscode.window.showInformationMessage(
-                        notification.message,
-                        messageOptions,
-                        ...commands
-                    );
-                    executeCommandByName(result);
-                    break;
-                }
-            }
-        });
-
-        this.registerExtensionsChanged(this._languageClient);
-        this.registerTelemetryChanged(this._languageClient);
-
-        // Start the client. This will also launch the server
-        this._languageClient.start();
-
-        // Register Razor dynamic file info handling
-        this.registerDynamicFileInfo(this._languageClient);
-
-        this.registerDebuggerAttach(this._languageClient);
+        // Start the client. This will also launch the server process.
+        await client.start();
+        return server;
     }
 
     public async stop(): Promise<void> {
-        await this._languageClient?.stop(RoslynLanguageServer._stopTimeout);
-        this._languageClient?.dispose(RoslynLanguageServer._stopTimeout);
-        this._languageClient = undefined;
+        await this._languageClient.stop(RoslynLanguageServer._stopTimeout);
     }
 
-    /**
-     * Restarts the language server. This does not wait until the server has been restarted.
-     * Note that since some options affect how the language server is initialized, we must
-     * re-create the LanguageClient instance instead of just stopping/starting it.
-     */
     public async restart(): Promise<void> {
-        await this.stop();
-        await this.start();
-    }
-
-    /**
-     * Allows consumers of this server to register for state change events.
-     * These state change events will be registered each time the underlying _languageClient instance is created.
-     */
-    public registerStateChangeEvent(listener: (event: ServerStateChange) => Promise<any>): Disposable {
-        this._eventBus.addListener(RoslynLanguageServer.serverStateChangeEvent, listener);
-        return new Disposable(() =>
-            this._eventBus.removeListener(RoslynLanguageServer.serverStateChangeEvent, listener)
-        );
+        await this._languageClient.restart();
     }
 
     /**
      * Returns whether or not the underlying LSP server is running or not.
      */
     public isRunning(): boolean {
-        return this._languageClient?.state === State.Running;
+        return this._languageClient.state === State.Running;
     }
 
     /**
@@ -323,7 +254,7 @@ export class RoslynLanguageServer {
             throw new Error('Tried to send request while server is not started.');
         }
 
-        const response = await this._languageClient!.sendRequest(type, params, token);
+        const response = await this._languageClient.sendRequest(type, params, token);
         return response;
     }
 
@@ -338,7 +269,7 @@ export class RoslynLanguageServer {
             throw new Error('Tried to send request while server is not started.');
         }
 
-        const response = await this._languageClient!.sendRequest(type, token);
+        const response = await this._languageClient.sendRequest(type, token);
         return response;
     }
 
@@ -348,9 +279,6 @@ export class RoslynLanguageServer {
         onProgress: (p: PR) => Promise<any>,
         cancellationToken?: vscode.CancellationToken
     ): Promise<R> {
-        if (!this._languageClient) {
-            throw new Error('Tried to send request while server is not started.');
-        }
         // Generate a UUID for our partial result token and apply it to our request.
         const partialResultToken: string = uuid.v4();
         params.partialResultToken = partialResultToken;
@@ -372,12 +300,12 @@ export class RoslynLanguageServer {
             throw new Error('Tried to send request while server is not started.');
         }
 
-        const response = await this._languageClient!.sendNotification(method, params);
+        const response = await this._languageClient.sendNotification(method, params);
         return response;
     }
 
     public async registerSolutionSnapshot(token: vscode.CancellationToken): Promise<SolutionSnapshotId> {
-        const response = await _languageServer.sendRequest0(RoslynProtocol.RegisterSolutionSnapshotRequest.type, token);
+        const response = await this.sendRequest0(RoslynProtocol.RegisterSolutionSnapshotRequest.type, token);
         if (response) {
             return new SolutionSnapshotId(response.id);
         }
@@ -398,7 +326,7 @@ export class RoslynLanguageServer {
     }
 
     private async sendOpenSolutionAndProjectsNotifications(): Promise<void> {
-        if (this._languageClient !== undefined && this._languageClient.isRunning()) {
+        if (this._languageClient.isRunning()) {
             if (this._solutionFile !== undefined) {
                 const protocolUri = this._languageClient.clientOptions.uriConverters!.code2Protocol(this._solutionFile);
                 await this._languageClient.sendNotification(RoslynProtocol.OpenSolutionNotification.type, {
@@ -408,7 +336,7 @@ export class RoslynLanguageServer {
 
             if (this._projectFiles.length > 0) {
                 const projectProtocolUris = this._projectFiles.map((uri) =>
-                    this._languageClient!.clientOptions.uriConverters!.code2Protocol(uri)
+                    this._languageClient.clientOptions.uriConverters!.code2Protocol(uri)
                 );
                 await this._languageClient.sendNotification(RoslynProtocol.OpenProjectNotification.type, {
                     projects: projectProtocolUris,
@@ -418,17 +346,12 @@ export class RoslynLanguageServer {
     }
 
     private async openDefaultSolutionOrProjects(): Promise<void> {
-        const options = this.optionProvider.GetLatestOptions();
-
         // If Dev Kit isn't installed, then we are responsible for picking the solution to open, assuming the user hasn't explicitly
         // disabled it.
-        if (
-            !this._wasActivatedWithCSharpDevkit &&
-            options.commonOptions.defaultSolution !== 'disable' &&
-            this._solutionFile === undefined
-        ) {
-            if (options.commonOptions.defaultSolution !== '') {
-                this.openSolution(vscode.Uri.file(options.commonOptions.defaultSolution));
+        const defaultSolution = commonOptions.defaultSolution;
+        if (!_wasActivatedWithCSharpDevkit && defaultSolution !== 'disable' && this._solutionFile === undefined) {
+            if (defaultSolution !== '') {
+                this.openSolution(vscode.Uri.file(defaultSolution));
             } else {
                 // Auto open if there is just one solution target; if there's more the one we'll just let the user pick with the picker.
                 const solutionUris = await vscode.workspace.findFiles('**/*.sln', '**/node_modules/**', 2);
@@ -466,7 +389,7 @@ export class RoslynLanguageServer {
                         const projectUris = await vscode.workspace.findFiles(
                             '**/*.csproj',
                             '**/node_modules/**',
-                            options.omnisharpOptions.maxProjectResults
+                            omnisharpOptions.maxProjectResults
                         );
 
                         this.openProjects(projectUris);
@@ -477,7 +400,7 @@ export class RoslynLanguageServer {
     }
 
     private async sendOrSubscribeForServiceBrokerConnection(): Promise<void> {
-        const csharpDevKitExtension = vscode.extensions.getExtension<CSharpDevKitExports>(csharpDevkitExtensionId);
+        const csharpDevKitExtension = getCSharpDevKit();
         if (csharpDevKitExtension) {
             const exports = await csharpDevKitExtension.activate();
 
@@ -487,10 +410,10 @@ export class RoslynLanguageServer {
             // then we have no projects, and so this extension won't have anything to do.
             if (exports.hasServerProcessLoaded()) {
                 const pipeName = await exports.getBrokeredServiceServerPipeName();
-                this._languageClient?.sendNotification('serviceBroker/connect', { pipeName: pipeName });
+                this._languageClient.sendNotification('serviceBroker/connect', { pipeName: pipeName });
             } else {
                 // We'll subscribe if the process later launches, and call this function again to send the pipe name.
-                this.context.subscriptions.push(
+                this._context.subscriptions.push(
                     exports.serverProcessLoaded(async () => this.sendOrSubscribeForServiceBrokerConnection())
                 );
             }
@@ -498,19 +421,19 @@ export class RoslynLanguageServer {
     }
 
     public getServerCapabilities(): any {
-        if (!this._languageClient) {
-            throw new Error('Tried to send request while server is not started.');
-        }
-
         const capabilities: any = this._languageClient.initializeResult?.capabilities;
         return capabilities;
     }
 
-    private async startServer(logLevel: string | undefined): Promise<cp.ChildProcess> {
-        const options = this.optionProvider.GetLatestOptions();
-        const serverPath = getServerPath(options, this.platformInfo);
+    private static async startServer(
+        platformInfo: PlatformInformation,
+        hostExecutableResolver: IHostExecutableResolver,
+        context: vscode.ExtensionContext,
+        additionalExtensionPaths: string[]
+    ): Promise<MessageTransports> {
+        const serverPath = getServerPath(platformInfo);
 
-        const dotnetInfo = await this.hostExecutableResolver.getHostExecutableInfo(options);
+        const dotnetInfo = await hostExecutableResolver.getHostExecutableInfo();
         const dotnetRuntimePath = path.dirname(dotnetInfo.path);
         const dotnetExecutablePath = dotnetInfo.path;
 
@@ -524,26 +447,38 @@ export class RoslynLanguageServer {
         // Save user's DOTNET_ROOT env-var value so server can recover the user setting when needed
         env.DOTNET_ROOT_USER = process.env.DOTNET_ROOT ?? 'EMPTY';
 
+        if (languageServerOptions.crashDumpPath) {
+            // Enable dump collection
+            env.DOTNET_DbgEnableMiniDump = '1';
+            // Collect heap dump
+            env.DOTNET_DbgMiniDumpType = '2';
+            // Collect crashreport.json with additional thread and stack frame information.
+            env.DOTNET_EnableCrashReport = '1';
+            // The dump file name format is <executable>.<pid>.dmp
+            env.DOTNET_DbgMiniDumpName = path.join(languageServerOptions.crashDumpPath, '%e.%p.dmp');
+        }
+
         let args: string[] = [];
 
-        if (options.commonOptions.waitForDebugger) {
+        if (commonOptions.waitForDebugger) {
             args.push('--debug');
         }
 
+        const logLevel = languageServerOptions.logLevel;
         if (logLevel) {
             args.push('--logLevel', logLevel);
         }
 
-        for (const extensionPath of this.additionalExtensionPaths) {
+        for (const extensionPath of additionalExtensionPaths) {
             args.push('--extension', extensionPath);
         }
 
         // Get the brokered service pipe name from C# Dev Kit (if installed).
         // We explicitly call this in the LSP server start action instead of awaiting it
         // in our activation because C# Dev Kit depends on C# activation completing.
-        const csharpDevkitExtension = vscode.extensions.getExtension<CSharpDevKitExports>(csharpDevkitExtensionId);
+        const csharpDevkitExtension = getCSharpDevKit();
         if (csharpDevkitExtension) {
-            this._wasActivatedWithCSharpDevkit = true;
+            _wasActivatedWithCSharpDevkit = true;
 
             // Get the starred suggestion dll location from C# Dev Kit IntelliCode (if both C# Dev Kit and C# Dev Kit IntelliCode are installed).
             const csharpDevkitIntelliCodeExtension = vscode.extensions.getExtension<CSharpIntelliCodeExports>(
@@ -559,7 +494,7 @@ export class RoslynLanguageServer {
                 _channel.appendLine('Activating C# + C# Dev Kit...');
             }
 
-            const csharpDevkitArgs = await this.getCSharpDevkitExportArgs(csharpDevkitExtension, options);
+            const csharpDevkitArgs = await this.getCSharpDevkitExportArgs(csharpDevkitExtension);
             args = args.concat(csharpDevkitArgs);
 
             await this.setupDevKitEnvironment(env, csharpDevkitExtension);
@@ -567,14 +502,14 @@ export class RoslynLanguageServer {
             // C# Dev Kit is not installed - continue C#-only activation.
             _channel.appendLine('Activating C# standalone...');
             vscode.commands.executeCommand('setContext', 'dotnet.server.activatedStandalone', true);
-            this._wasActivatedWithCSharpDevkit = false;
+            _wasActivatedWithCSharpDevkit = false;
         }
 
         if (logLevel && [Trace.Messages, Trace.Verbose].includes(this.GetTraceLevel(logLevel))) {
             _channel.appendLine(`Starting server at ${serverPath}`);
         }
 
-        args.push('--extensionLogDirectory', this.context.logUri.fsPath);
+        args.push('--extensionLogDirectory', context.logUri.fsPath);
 
         let childProcess: cp.ChildProcessWithoutNullStreams;
         const cpOptions: cp.SpawnOptionsWithoutStdio = {
@@ -601,55 +536,170 @@ export class RoslynLanguageServer {
             childProcess = cp.spawn(serverPath, args, cpOptions);
         }
 
-        return childProcess;
+        // Record the stdout and stderr streams from the server process.
+        childProcess.stdout.on('data', (data: { toString: (arg0: any) => any }) => {
+            const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding);
+            _channel.append('[stdout] ' + result);
+        });
+        childProcess.stderr.on('data', (data: { toString: (arg0: any) => any }) => {
+            const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding);
+            _channel.append('[stderr] ' + result);
+        });
+
+        // Timeout promise used to time out the connection process if it takes too long.
+        const timeout = new Promise<undefined>((resolve, reject) => {
+            RAL().timer.setTimeout(resolve, languageServerOptions.startTimeout);
+
+            // If the child process exited unexpectedly, reject the promise early.
+            // Error information will be captured from the stdout/stderr streams above.
+            childProcess.on('exit', (code) => {
+                if (code && code !== 0) {
+                    _channel.appendLine(`Language server process exited with ${code}`);
+                    reject();
+                }
+            });
+        });
+
+        // The server process will create the named pipe used for communcation. Wait for it to be created,
+        // and listen for the server to pass back the connection information via stdout.
+        const namedPipeConnectionPromise = new Promise<NamedPipeInformation>((resolve) => {
+            _channel.appendLine('waiting for named pipe information from server...');
+            childProcess.stdout.on('data', (data: { toString: (arg0: any) => any }) => {
+                const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding);
+                // Use the regular expression to find all JSON lines
+                const jsonLines = result.match(RoslynLanguageServer.namedPipeKeyRegex);
+                if (jsonLines) {
+                    const transmittedPipeNameInfo: NamedPipeInformation = JSON.parse(jsonLines[0]);
+                    _channel.appendLine('received named pipe information from server');
+                    resolve(transmittedPipeNameInfo);
+                }
+            });
+        });
+
+        // Wait for the server to send back the name of the pipe to connect to.
+        // If it takes too long it will timeout and throw an error.
+        const pipeConnectionInfo = await Promise.race([namedPipeConnectionPromise, timeout]);
+        if (pipeConnectionInfo === undefined) {
+            throw new Error('Timeout. Named pipe information not received from server.');
+        }
+
+        const socketPromise = new Promise<net.Socket>((resolve) => {
+            _channel.appendLine('attempting to connect client to server...');
+            const socket = net.createConnection(pipeConnectionInfo.pipeName, () => {
+                _channel.appendLine('client has connected to server');
+                resolve(socket);
+            });
+        });
+
+        // Wait for the client to connect to the named pipe.
+        // If it takes too long it will timeout and throw an error.
+        const socket = await Promise.race([socketPromise, timeout]);
+        if (socket === undefined) {
+            throw new Error(
+                'Timeout. Client cound not connect to server via named pipe: ' + pipeConnectionInfo.pipeName
+            );
+        }
+
+        return {
+            reader: new SocketMessageReader(socket, RoslynLanguageServer.encoding),
+            writer: new SocketMessageWriter(socket, RoslynLanguageServer.encoding),
+        };
     }
 
-    private registerDynamicFileInfo(client: RoslynLanguageClient) {
+    private registerDynamicFileInfo() {
         // When the Roslyn language server sends a request for Razor dynamic file info, we forward that request along to Razor via
         // a command.
-        client.onRequest(RoslynLanguageServer.provideRazorDynamicFileInfoMethodName, async (request) =>
+        this._languageClient.onRequest(RoslynLanguageServer.provideRazorDynamicFileInfoMethodName, async (request) =>
             vscode.commands.executeCommand(DynamicFileInfoHandler.provideDynamicFileInfoCommand, request)
         );
-        client.onNotification(RoslynLanguageServer.removeRazorDynamicFileInfoMethodName, async (notification) =>
-            vscode.commands.executeCommand(DynamicFileInfoHandler.removeDynamicFileInfoCommand, notification)
+        this._languageClient.onNotification(
+            RoslynLanguageServer.removeRazorDynamicFileInfoMethodName,
+            async (notification) =>
+                vscode.commands.executeCommand(DynamicFileInfoHandler.removeDynamicFileInfoCommand, notification)
         );
     }
 
-    private registerDebuggerAttach(client: RoslynLanguageClient) {
-        client.onRequest<RoslynProtocol.DebugAttachParams, RoslynProtocol.DebugAttachResult, void>(
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    private WaitForAttachCompleteAsync(attachRequestId: string): Promise<boolean> {
+        return new Promise<boolean>((resolve) => {
+            let didTerminateRegistation: IDisposable | null = null;
+            let customEventReg: IDisposable | null = null;
+            let isComplete = false;
+
+            const fire = (result: boolean) => {
+                if (isComplete === false) {
+                    isComplete = true;
+                    didTerminateRegistation?.dispose();
+                    customEventReg?.dispose();
+                    resolve(result);
+                }
+            };
+
+            didTerminateRegistation = vscode.debug.onDidTerminateDebugSession((session: vscode.DebugSession) => {
+                if (session.configuration.attachRequestId !== attachRequestId) {
+                    return;
+                }
+
+                fire(false);
+            });
+
+            customEventReg = vscode.debug.onDidReceiveDebugSessionCustomEvent(
+                (event: vscode.DebugSessionCustomEvent) => {
+                    if (event.session.configuration.attachRequestId !== attachRequestId) {
+                        return;
+                    }
+
+                    if (event.event !== 'attachComplete') {
+                        return;
+                    }
+
+                    fire(true);
+                }
+            );
+        });
+    }
+
+    private registerDebuggerAttach() {
+        this._languageClient.onRequest<RoslynProtocol.DebugAttachParams, RoslynProtocol.DebugAttachResult, void>(
             RoslynProtocol.DebugAttachRequest.type,
             async (request) => {
-                const debugOptions = this.optionProvider.GetLatestOptions().commonOptions.unitTestDebuggingOptions;
+                const debugOptions = commonOptions.unitTestDebuggingOptions;
                 const debugConfiguration: vscode.DebugConfiguration = {
                     ...debugOptions,
-                    name: '.NET Core Attach',
+                    name: '.NET Debug Unit test',
                     type: 'coreclr',
                     request: 'attach',
                     processId: request.processId,
+                    attachRequestId: randomUUID(),
                 };
 
-                const result = await vscode.debug.startDebugging(undefined, debugConfiguration, undefined);
-                return {
-                    didAttach: result,
-                };
+                const waitCompletePromise = this.WaitForAttachCompleteAsync(debugConfiguration.attachRequestId);
+
+                let success = await vscode.debug.startDebugging(undefined, debugConfiguration, undefined);
+                if (!success) {
+                    return { didAttach: false };
+                }
+
+                success = await waitCompletePromise;
+                return { didAttach: success };
             }
         );
     }
 
-    private registerExtensionsChanged(languageClient: RoslynLanguageClient) {
+    private registerExtensionsChanged() {
         // subscribe to extension change events so that we can get notified if C# Dev Kit is added/removed later.
-        languageClient.addDisposable(
+        this._languageClient.addDisposable(
             vscode.extensions.onDidChange(async () => {
                 const csharpDevkitExtension = getCSharpDevKit();
 
-                if (this._wasActivatedWithCSharpDevkit === undefined) {
+                if (_wasActivatedWithCSharpDevkit === undefined) {
                     // Haven't activated yet.
                     return;
                 }
 
                 const title = vscode.l10n.t('Restart Language Server');
                 const command = 'dotnet.restartServer';
-                if (csharpDevkitExtension && !this._wasActivatedWithCSharpDevkit) {
+                if (csharpDevkitExtension && !_wasActivatedWithCSharpDevkit) {
                     // We previously started without C# Dev Kit and its now installed.
                     // Offer a prompt to restart the server to use C# Dev Kit.
                     _channel.appendLine(`Detected new installation of ${csharpDevkitExtensionId}`);
@@ -663,9 +713,9 @@ export class RoslynLanguageServer {
         );
     }
 
-    private registerTelemetryChanged(languageClient: RoslynLanguageClient) {
+    private registerTelemetryChanged() {
         // Subscribe to telemetry events so we can enable/disable as needed
-        languageClient.addDisposable(
+        this._languageClient.addDisposable(
             vscode.env.onDidChangeTelemetryEnabled((_: boolean) => {
                 const title = 'Restart Language Server';
                 const command = 'dotnet.restartServer';
@@ -676,13 +726,12 @@ export class RoslynLanguageServer {
         );
     }
 
-    private async getCSharpDevkitExportArgs(
-        csharpDevkitExtension: vscode.Extension<CSharpDevKitExports>,
-        options: Options
+    private static async getCSharpDevkitExportArgs(
+        csharpDevkitExtension: vscode.Extension<CSharpDevKitExports>
     ): Promise<string[]> {
         const exports: CSharpDevKitExports = await csharpDevkitExtension.activate();
 
-        const extensionPaths = options.languageServerOptions.extensionsPaths || [
+        const extensionPaths = languageServerOptions.extensionsPaths || [
             this.getLanguageServicesDevKitComponentPath(exports),
         ];
 
@@ -700,7 +749,7 @@ export class RoslynLanguageServer {
         return args;
     }
 
-    private async getCSharpDevkitIntelliCodeExportArgs(
+    private static async getCSharpDevkitIntelliCodeExportArgs(
         csharpDevkitIntelliCodeExtension: vscode.Extension<CSharpIntelliCodeExports>
     ): Promise<string[]> {
         const exports = await csharpDevkitIntelliCodeExtension.activate();
@@ -711,7 +760,7 @@ export class RoslynLanguageServer {
         return csharpIntelliCodeArgs;
     }
 
-    private async setupDevKitEnvironment(
+    private static async setupDevKitEnvironment(
         env: NodeJS.ProcessEnv,
         csharpDevkitExtension: vscode.Extension<CSharpDevKitExports>
     ): Promise<void> {
@@ -726,14 +775,14 @@ export class RoslynLanguageServer {
         await exports.setupTelemetryEnvironmentAsync(env);
     }
 
-    private getLanguageServicesDevKitComponentPath(csharpDevKitExports: CSharpDevKitExports): string {
+    private static getLanguageServicesDevKitComponentPath(csharpDevKitExports: CSharpDevKitExports): string {
         return path.join(
             csharpDevKitExports.components['@microsoft/visualstudio-languageservices-devkit'],
             'Microsoft.VisualStudio.LanguageServices.DevKit.dll'
         );
     }
 
-    private GetTraceLevel(logLevel: string): Trace {
+    private static GetTraceLevel(logLevel: string): Trace {
         switch (logLevel) {
             case 'Trace':
                 return Trace.Verbose;
@@ -758,7 +807,7 @@ export class RoslynLanguageServer {
     }
 
     public async getBuildOnlyDiagnosticIds(token: vscode.CancellationToken): Promise<string[]> {
-        const response = await _languageServer.sendRequest0(RoslynProtocol.BuildOnlyDiagnosticIdsRequest.type, token);
+        const response = await this.sendRequest0(RoslynProtocol.BuildOnlyDiagnosticIdsRequest.type, token);
         if (response) {
             return response.ids;
         }
@@ -768,21 +817,16 @@ export class RoslynLanguageServer {
 }
 
 /**
- * Brokered service implementation.
+ * Creates and activates the Roslyn language server.
+ * The returned promise will complete when the server starts.
  */
-export class SolutionSnapshotProvider implements ISolutionSnapshotProvider {
-    public async registerSolutionSnapshot(token: vscode.CancellationToken): Promise<SolutionSnapshotId> {
-        return _languageServer.registerSolutionSnapshot(token);
-    }
-}
-
 export async function activateRoslynLanguageServer(
     context: vscode.ExtensionContext,
     platformInfo: PlatformInformation,
-    optionProvider: OptionProvider,
-    optionObservable: Observable<Options>,
+    optionObservable: Observable<void>,
     outputChannel: vscode.OutputChannel,
-    dotnetTestChannel: vscode.OutputChannel
+    dotnetTestChannel: vscode.OutputChannel,
+    languageServerEvents: RoslynLanguageServerEvents
 ): Promise<RoslynLanguageServer> {
     // Create a channel for outputting general logs from the language server.
     _channel = outputChannel;
@@ -796,63 +840,32 @@ export async function activateRoslynLanguageServer(
         context.extensionPath
     );
     const additionalExtensionPaths = scanExtensionPlugins();
-    _languageServer = new RoslynLanguageServer(
+
+    const languageServer = await RoslynLanguageServer.initializeAsync(
         platformInfo,
         hostExecutableResolver,
-        optionProvider,
         context,
-        additionalExtensionPaths
+        additionalExtensionPaths,
+        languageServerEvents
     );
 
     // Register any commands that need to be handled by the extension.
-    registerCommands(context, _languageServer, optionProvider, hostExecutableResolver, _channel);
+    registerCommands(context, languageServer, hostExecutableResolver, _channel);
 
-    registerRazorCommands(context, _languageServer);
+    registerCodeActionFixAllCommands(context, languageServer, _channel);
 
-    registerUnitTestingCommands(context, _languageServer, dotnetTestChannel);
+    registerRazorCommands(context, languageServer);
 
-    // Register any needed debugger components that need to communicate with the language server.
-    registerDebugger(context, _languageServer, platformInfo, optionProvider, _channel);
+    registerUnitTestingCommands(context, languageServer, dotnetTestChannel);
 
-    context.subscriptions.push(registerLanguageServerOptionChanges(optionObservable));
-
-    const options = optionProvider.GetLatestOptions();
-    let source = new vscode.CancellationTokenSource();
-    vscode.workspace.onDidChangeTextDocument(async (e) => {
-        if (!options.languageServerOptions.documentSelector.includes(e.document.languageId)) {
-            return;
-        }
-
-        if (e.contentChanges.length > 1 || e.contentChanges.length === 0) {
-            return;
-        }
-
-        const change = e.contentChanges[0];
-
-        if (!change.range.isEmpty) {
-            return;
-        }
-
-        const capabilities = await _languageServer.getServerCapabilities();
-
-        if (capabilities._vs_onAutoInsertProvider) {
-            // Regular expression to match all whitespace characters except the newline character
-            const changeTrimmed = change.text.replace(/[^\S\n]+/g, '');
-
-            if (!capabilities._vs_onAutoInsertProvider._vs_triggerCharacters.includes(changeTrimmed)) {
-                return;
-            }
+    // Register any needed debugger components that need to communicate with the language server.
+    registerDebugger(context, languageServer, languageServerEvents, platformInfo, _channel);
 
-            source.cancel();
-            source = new vscode.CancellationTokenSource();
-            await applyAutoInsertEdit(e, changeTrimmed, source.token);
-        }
-    });
+    registerOnAutoInsert(languageServer);
 
-    // Start the language server.
-    await _languageServer.start();
+    context.subscriptions.push(registerLanguageServerOptionChanges(optionObservable));
 
-    return _languageServer;
+    return languageServer;
 
     function scanExtensionPlugins(): string[] {
         return vscode.extensions.all.flatMap((extension) => {
@@ -876,11 +889,17 @@ export async function activateRoslynLanguageServer(
     }
 }
 
-function getServerPath(options: Options, platformInfo: PlatformInformation) {
-    let serverPath = options.commonOptions.serverPath;
-    if (!serverPath) {
-        // Option not set, use the path from the extension.
-        serverPath = getInstalledServerPath(platformInfo);
+function getServerPath(platformInfo: PlatformInformation) {
+    let serverPath = process.env.DOTNET_ROSLYN_SERVER_PATH;
+
+    if (serverPath) {
+        _channel.appendLine(`Using server path override from DOTNET_ROSLYN_SERVER_PATH: ${serverPath}`);
+    } else {
+        serverPath = commonOptions.serverPath;
+        if (!serverPath) {
+            // Option not set, use the path from the extension.
+            serverPath = getInstalledServerPath(platformInfo);
+        }
     }
 
     if (!fs.existsSync(serverPath)) {
@@ -913,157 +932,6 @@ function getInstalledServerPath(platformInfo: PlatformInformation): string {
     return pathWithExtension;
 }
 
-export async function waitForProjectInitialization(): Promise<void> {
-    return new Promise((resolve, _) => {
-        _languageServer.registerStateChangeEvent(async (state) => {
-            if (state === ServerStateChange.ProjectInitializationComplete) {
-                resolve();
-            }
-        });
-    });
-}
-
-function registerRazorCommands(context: vscode.ExtensionContext, languageServer: RoslynLanguageServer) {
-    // Razor will call into us (via command) for generated file didChange/didClose notifications. We'll then forward these
-    // notifications along to Roslyn. didOpen notifications are handled separately via the vscode.openTextDocument method.
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.roslynDidChangeCommand,
-            async (notification: DidChangeTextDocumentParams) => {
-                await languageServer.sendNotification(DidChangeTextDocumentNotification.method, notification);
-            }
-        )
-    );
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.roslynDidCloseCommand,
-            async (notification: DidCloseTextDocumentParams) => {
-                await languageServer.sendNotification(DidCloseTextDocumentNotification.method, notification);
-            }
-        )
-    );
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.roslynPullDiagnosticCommand,
-            async (request: DocumentDiagnosticParams) => {
-                const diagnosticRequestType = new RequestType<DocumentDiagnosticParams, DocumentDiagnosticReport, any>(
-                    DocumentDiagnosticRequest.method
-                );
-                return await languageServer.sendRequest(diagnosticRequestType, request, CancellationToken.None);
-            }
-        )
-    );
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.roslynSimplifyMethodCommand,
-            async (request: SerializableSimplifyMethodParams) => {
-                const simplifyMethodRequestType = new RequestType<SerializableSimplifyMethodParams, TextEdit[], any>(
-                    'roslyn/simplifyMethod'
-                );
-                return await languageServer.sendRequest(simplifyMethodRequestType, request, CancellationToken.None);
-            }
-        )
-    );
-
-    // The VS Code API for code actions (and the vscode.CodeAction type) doesn't support everything that LSP supports,
-    // namely the data property, which Razor needs to identify which code actions are on their allow list, so we need
-    // to expose a command for them to directly invoke our code actions LSP endpoints, rather than use built-in commands.
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.provideCodeActionsCommand,
-            async (request: CodeActionParams) => {
-                return await languageServer.sendRequest(CodeActionRequest.type, request, CancellationToken.None);
-            }
-        )
-    );
-    context.subscriptions.push(
-        vscode.commands.registerCommand(RoslynLanguageServer.resolveCodeActionCommand, async (request: CodeAction) => {
-            return await languageServer.sendRequest(CodeActionResolveRequest.type, request, CancellationToken.None);
-        })
-    );
-
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.provideCompletionsCommand,
-            async (request: CompletionParams) => {
-                return await languageServer.sendRequest(CompletionRequest.type, request, CancellationToken.None);
-            }
-        )
-    );
-    context.subscriptions.push(
-        vscode.commands.registerCommand(
-            RoslynLanguageServer.resolveCompletionsCommand,
-            async (request: CompletionItem) => {
-                return await languageServer.sendRequest(CompletionResolveRequest.type, request, CancellationToken.None);
-            }
-        )
-    );
-
-    // Roslyn is responsible for producing a json file containing information for Razor, that comes from the compilation for
-    // a project. We want to defer this work until necessary, so this command is called by the Razor document manager to tell
-    // us when they need us to initialize the Razor things.
-    context.subscriptions.push(
-        vscode.commands.registerCommand(RoslynLanguageServer.razorInitializeCommand, async () => {
-            await languageServer.sendNotification('razor/initialize', {});
-        })
-    );
-}
-
-async function applyAutoInsertEdit(
-    e: vscode.TextDocumentChangeEvent,
-    changeTrimmed: string,
-    token: vscode.CancellationToken
-) {
-    const change = e.contentChanges[0];
-    // The server expects the request position to represent the caret position in the text after the change has already been applied.
-    // We need to calculate what that position would be after the change is applied and send that to the server.
-    const position = new vscode.Position(
-        change.range.start.line,
-        change.range.start.character + (change.text.length - change.rangeLength)
-    );
-    const uri = UriConverter.serialize(e.document.uri);
-    const textDocument = TextDocumentIdentifier.create(uri);
-    const formattingOptions = getFormattingOptions();
-    const request: RoslynProtocol.OnAutoInsertParams = {
-        _vs_textDocument: textDocument,
-        _vs_position: position,
-        _vs_ch: changeTrimmed,
-        _vs_options: formattingOptions,
-    };
-
-    const response = await _languageServer.sendRequest(RoslynProtocol.OnAutoInsertRequest.type, request, token);
-    if (response) {
-        const textEdit = response._vs_textEdit;
-        const startPosition = new vscode.Position(textEdit.range.start.line, textEdit.range.start.character);
-        const endPosition = new vscode.Position(textEdit.range.end.line, textEdit.range.end.character);
-        const docComment = new vscode.SnippetString(textEdit.newText);
-        const code: any = vscode;
-        const textEdits = [new code.SnippetTextEdit(new vscode.Range(startPosition, endPosition), docComment)];
-        const edit = new vscode.WorkspaceEdit();
-        edit.set(e.document.uri, textEdits);
-
-        const applied = vscode.workspace.applyEdit(edit);
-        if (!applied) {
-            throw new Error('Tried to insert a comment but an error occurred.');
-        }
-    }
-}
-
-function getFormattingOptions(): FormattingOptions {
-    const editorConfig = vscode.workspace.getConfiguration('editor');
-    const tabSize = editorConfig.get<number>('tabSize') ?? 4;
-    const insertSpaces = editorConfig.get<boolean>('insertSpaces') ?? true;
-    return FormattingOptions.create(tabSize, insertSpaces);
-}
-
-// this method is called when your extension is deactivated
-export async function deactivate() {
-    if (!_languageServer) {
-        return undefined;
-    }
-    return _languageServer.stop();
-}
-
 // VS code will have a default session id when running under tests. Since we may still
 // report telemetry, we need to give a unique session id instead of the default value.
 function getSessionId(): string {
@@ -1076,3 +944,7 @@ function getSessionId(): string {
 
     return sessionId;
 }
+
+export function isString(value: any): value is string {
+    return typeof value === 'string' || value instanceof String;
+}
diff --git a/src/lsptoolshost/roslynLanguageServerExportChannel.ts b/src/lsptoolshost/roslynLanguageServerExportChannel.ts
index 1adfe69a0..be5372881 100644
--- a/src/lsptoolshost/roslynLanguageServerExportChannel.ts
+++ b/src/lsptoolshost/roslynLanguageServerExportChannel.ts
@@ -7,24 +7,14 @@ import { RequestType } from 'vscode-languageclient/node';
 import { RoslynLanguageServer } from './roslynLanguageServer';
 
 export class RoslynLanguageServerExport {
-    private _server: RoslynLanguageServer | undefined;
-
-    constructor(private serverPromise: Promise<RoslynLanguageServer>) {}
-
-    private async ensureServer(): Promise<RoslynLanguageServer> {
-        if (this._server === undefined) {
-            this._server = await this.serverPromise;
-        }
-
-        return this._server;
-    }
+    constructor(private _serverInitialized: Promise<RoslynLanguageServer>) {}
 
     public async sendRequest<Params, Response, Error>(
         type: RequestType<Params, Response, Error>,
         params: Params,
         token: vscode.CancellationToken
     ): Promise<Response> {
-        const server = await this.ensureServer();
+        const server = await this._serverInitialized;
         // We need to recreate the type parameter to ensure that the prototypes line up. The `RequestType` we receive could have been
         // from a different version.
         const newType = new RequestType<Params, Response, Error>(type.method);
diff --git a/src/lsptoolshost/roslynProtocol.ts b/src/lsptoolshost/roslynProtocol.ts
index 27e63e65e..9e6691468 100644
--- a/src/lsptoolshost/roslynProtocol.ts
+++ b/src/lsptoolshost/roslynProtocol.ts
@@ -5,6 +5,7 @@
 
 import { Command } from 'vscode';
 import * as lsp from 'vscode-languageserver-protocol';
+import { CodeAction } from 'vscode-languageserver-protocol';
 import { ProjectConfigurationMessage } from '../shared/projectConfiguration';
 
 export interface WorkspaceDebugConfigurationParams {
@@ -83,6 +84,11 @@ export interface RunTestsParams extends lsp.WorkDoneProgressParams, lsp.PartialR
      * Whether the request should attempt to call back to the client to attach a debugger before running the tests.
      */
     attachDebugger: boolean;
+
+    /**
+     * The absolute path to a .runsettings file to configure the test run.
+     */
+    runSettingsPath?: string;
 }
 
 export interface TestProgress {
@@ -136,6 +142,14 @@ export interface BuildOnlyDiagnosticIdsResult {
     ids: string[];
 }
 
+export interface RoslynFixAllCodeAction extends CodeAction {
+    scope: string;
+}
+
+export interface NamedPipeInformation {
+    pipeName: string;
+}
+
 export namespace WorkspaceDebugConfigurationRequest {
     export const method = 'workspace/debugConfiguration';
     export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;
@@ -209,3 +223,9 @@ export namespace BuildOnlyDiagnosticIdsRequest {
     export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;
     export const type = new lsp.RequestType0<BuildOnlyDiagnosticIdsResult, void>(method);
 }
+
+export namespace CodeActionFixAllResolveRequest {
+    export const method = 'codeAction/resolveFixAll';
+    export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;
+    export const type = new lsp.RequestType<RoslynFixAllCodeAction, RoslynFixAllCodeAction, void>(method);
+}
diff --git a/src/lsptoolshost/roslynWorkspaceDebugConfigurationProvider.ts b/src/lsptoolshost/roslynWorkspaceDebugConfigurationProvider.ts
index f5e3cb990..9e820c656 100644
--- a/src/lsptoolshost/roslynWorkspaceDebugConfigurationProvider.ts
+++ b/src/lsptoolshost/roslynWorkspaceDebugConfigurationProvider.ts
@@ -11,11 +11,15 @@ import {
 } from '../shared/IWorkspaceDebugInformationProvider';
 import { isBlazorWebAssemblyHosted, isBlazorWebAssemblyProject, isWebProject } from '../shared/utils';
 import { RoslynLanguageServer } from './roslynLanguageServer';
-import { WorkspaceDebugConfigurationParams, WorkspaceDebugConfigurationRequest } from './roslynProtocol';
+import {
+    ProjectDebugConfiguration,
+    WorkspaceDebugConfigurationParams,
+    WorkspaceDebugConfigurationRequest,
+} from './roslynProtocol';
 import { UriConverter } from './uriConverter';
 
 export class RoslynWorkspaceDebugInformationProvider implements IWorkspaceDebugInformationProvider {
-    constructor(private server: RoslynLanguageServer) {}
+    constructor(private server: RoslynLanguageServer, private outputChannel: vscode.OutputChannel) {}
 
     public async getWorkspaceDebugInformation(
         workspaceFolder: vscode.Uri
@@ -28,11 +32,20 @@ export class RoslynWorkspaceDebugInformationProvider implements IWorkspaceDebugI
             workspacePath: UriConverter.serialize(workspaceFolder),
         };
 
-        const response = await this.server.sendRequest(
-            WorkspaceDebugConfigurationRequest.type,
-            params,
-            new vscode.CancellationTokenSource().token
-        );
+        let response: ProjectDebugConfiguration[];
+        try {
+            response = await this.server.sendRequest(
+                WorkspaceDebugConfigurationRequest.type,
+                params,
+                new vscode.CancellationTokenSource().token
+            );
+        } catch (e) {
+            // Server errors are already logged by the language client, but its totally possible
+            // that we fail because the server is restarting or a process got killed, etc.
+            // Catch the error and log to the correct output (instead of going to the extension host output).
+            this.outputChannel.appendLine(`Failed to get debug configuration: ${e}`);
+            return;
+        }
 
         // LSP serializes and deserializes URIs as (URI formatted) strings not actual types.  So convert to the actual type here.
         const projects: ProjectDebugInformation[] | undefined = await mapAsync(response, async (p) => {
diff --git a/src/lsptoolshost/services/solutionSnapshotProvider.ts b/src/lsptoolshost/services/solutionSnapshotProvider.ts
new file mode 100644
index 000000000..41908edb8
--- /dev/null
+++ b/src/lsptoolshost/services/solutionSnapshotProvider.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { RoslynLanguageServer } from '../roslynLanguageServer';
+import { ISolutionSnapshotProvider, SolutionSnapshotId } from './ISolutionSnapshotProvider';
+
+/**
+ * Brokered service implementation.
+ */
+export class SolutionSnapshotProvider implements ISolutionSnapshotProvider {
+    constructor(private _languageServerPromise: Promise<RoslynLanguageServer>) {}
+    public async registerSolutionSnapshot(token: vscode.CancellationToken): Promise<SolutionSnapshotId> {
+        const languageServer = await this._languageServerPromise;
+        return languageServer.registerSolutionSnapshot(token);
+    }
+}
diff --git a/src/lsptoolshost/showToastNotification.ts b/src/lsptoolshost/showToastNotification.ts
new file mode 100644
index 000000000..df57ac54f
--- /dev/null
+++ b/src/lsptoolshost/showToastNotification.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { RoslynLanguageClient } from './roslynLanguageClient';
+import { MessageType } from 'vscode-languageserver-protocol';
+import { ShowToastNotification } from './roslynProtocol';
+
+export function registerShowToastNotification(client: RoslynLanguageClient) {
+    client.onNotification(ShowToastNotification.type, async (notification) => {
+        const messageOptions: vscode.MessageOptions = {
+            modal: false,
+        };
+        const commands = notification.commands.map((command) => command.title);
+        const executeCommandByName = async (result: string | undefined) => {
+            if (result) {
+                const command = notification.commands.find((command) => command.title === result);
+                if (!command) {
+                    throw new Error(`Unknown command ${result}`);
+                }
+
+                if (command.arguments) {
+                    await vscode.commands.executeCommand(command.command, ...command.arguments);
+                } else {
+                    await vscode.commands.executeCommand(command.command);
+                }
+            }
+        };
+
+        switch (notification.messageType) {
+            case MessageType.Error: {
+                const result = await vscode.window.showErrorMessage(notification.message, messageOptions, ...commands);
+                executeCommandByName(result);
+                break;
+            }
+            case MessageType.Warning: {
+                const result = await vscode.window.showWarningMessage(
+                    notification.message,
+                    messageOptions,
+                    ...commands
+                );
+                executeCommandByName(result);
+                break;
+            }
+            default: {
+                const result = await vscode.window.showInformationMessage(
+                    notification.message,
+                    messageOptions,
+                    ...commands
+                );
+                executeCommandByName(result);
+                break;
+            }
+        }
+    });
+}
diff --git a/src/lsptoolshost/unitTesting.ts b/src/lsptoolshost/unitTesting.ts
index 298cda283..ba955b376 100644
--- a/src/lsptoolshost/unitTesting.ts
+++ b/src/lsptoolshost/unitTesting.ts
@@ -3,10 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
+import * as path from 'path';
 import * as vscode from 'vscode';
 import * as languageClient from 'vscode-languageclient/node';
 import { RoslynLanguageServer } from './roslynLanguageServer';
-import { RunTestsParams, RunTestsPartialResult, RunTestsRequest } from './roslynProtocol';
+import { RunTestsParams, RunTestsPartialResult, RunTestsRequest, TestProgress } from './roslynProtocol';
+import { commonOptions } from '../shared/options';
 
 export function registerUnitTestingCommands(
     context: vscode.ExtensionContext,
@@ -14,39 +17,44 @@ export function registerUnitTestingCommands(
     dotnetTestChannel: vscode.OutputChannel
 ) {
     context.subscriptions.push(
-        vscode.commands.registerCommand('dotnet.test.run', async (request) =>
-            runTests(request, languageServer, dotnetTestChannel)
+        vscode.commands.registerCommand(
+            'dotnet.test.run',
+            async (request): Promise<TestProgress | undefined> => runTests(request, languageServer, dotnetTestChannel)
         )
     );
     context.subscriptions.push(
-        vscode.commands.registerTextEditorCommand(
+        // We don't use registerTextEditorCommand because it is required to run synchronously and is not awaitable.
+        // See https://github.com/microsoft/vscode/issues/16814 for more info.
+        vscode.commands.registerCommand(
             'dotnet.test.runTestsInContext',
-            async (textEditor: vscode.TextEditor) => {
-                return runTestsInContext(false, textEditor, languageServer, dotnetTestChannel);
-            }
+            async (): Promise<TestProgress | undefined> => runTestsInContext(false, languageServer, dotnetTestChannel)
         )
     );
 
     context.subscriptions.push(
-        vscode.commands.registerTextEditorCommand(
+        vscode.commands.registerCommand(
             'dotnet.test.debugTestsInContext',
-            async (textEditor: vscode.TextEditor) => {
-                return runTestsInContext(true, textEditor, languageServer, dotnetTestChannel);
-            }
+            async (): Promise<TestProgress | undefined> => runTestsInContext(true, languageServer, dotnetTestChannel)
         )
     );
 }
 
 async function runTestsInContext(
     debug: boolean,
-    textEditor: vscode.TextEditor,
     languageServer: RoslynLanguageServer,
     dotnetTestChannel: vscode.OutputChannel
-) {
-    const contextRange: languageClient.Range = { start: textEditor.selection.active, end: textEditor.selection.active };
-    const textDocument: languageClient.TextDocumentIdentifier = { uri: textEditor.document.fileName };
+): Promise<TestProgress | undefined> {
+    const activeEditor = vscode.window.activeTextEditor;
+    if (!activeEditor) {
+        throw new Error('No active editor');
+    }
+    const contextRange: languageClient.Range = {
+        start: activeEditor.selection.active,
+        end: activeEditor.selection.active,
+    };
+    const textDocument: languageClient.TextDocumentIdentifier = { uri: activeEditor.document.fileName };
     const request: RunTestsParams = { textDocument: textDocument, range: contextRange, attachDebugger: debug };
-    await runTests(request, languageServer, dotnetTestChannel);
+    return runTests(request, languageServer, dotnetTestChannel);
 }
 
 let _testRunInProgress = false;
@@ -55,16 +63,19 @@ async function runTests(
     request: RunTestsParams,
     languageServer: RoslynLanguageServer,
     dotnetTestChannel: vscode.OutputChannel
-) {
+): Promise<TestProgress | undefined> {
     if (_testRunInProgress) {
         vscode.window.showErrorMessage('Test run already in progress');
         return;
     }
 
+    request.runSettingsPath = getRunSettings(request.textDocument.uri, dotnetTestChannel);
+
     _testRunInProgress = true;
 
     dotnetTestChannel.show(true);
-    vscode.window
+    let lastProgress: TestProgress | undefined = undefined;
+    await vscode.window
         .withProgress(
             {
                 location: vscode.ProgressLocation.Notification,
@@ -87,6 +98,7 @@ async function runTests(
                         const reportIncrement = ((completed - totalReportedComplete) / totalTests) * 100;
                         progress.report({ message: output.stage, increment: reportIncrement });
                         totalReportedComplete = completed;
+                        lastProgress = output.progress;
                     } else {
                         progress.report({ message: output.stage });
                     }
@@ -121,7 +133,40 @@ async function runTests(
             }
         )
         .then(
-            () => (_testRunInProgress = false),
-            () => (_testRunInProgress = false)
+            () => {
+                _testRunInProgress = false;
+            },
+            () => {
+                _testRunInProgress = false;
+            }
         );
+
+    return lastProgress;
+}
+
+function getRunSettings(documentUri: string, dotnetTestChannel: vscode.OutputChannel): string | undefined {
+    const runSettingsPathOption = commonOptions.runSettingsPath;
+    if (runSettingsPathOption.length === 0) {
+        return undefined;
+    }
+
+    let absolutePath = runSettingsPathOption;
+    if (!path.isAbsolute(runSettingsPathOption)) {
+        // Path is relative to the workspace. Create absolute path.
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(vscode.Uri.parse(documentUri));
+        if (workspaceFolder === undefined) {
+            dotnetTestChannel.appendLine(
+                `Warning: Unable to find workspace folder for ${documentUri}, cannot resolve run settings path ${runSettingsPathOption}.`
+            );
+            return undefined;
+        }
+        absolutePath = path.join(workspaceFolder.uri.fsPath, runSettingsPathOption);
+    }
+
+    if (!fs.existsSync(absolutePath)) {
+        dotnetTestChannel.appendLine(`Warning: Unable to find run settings file at ${absolutePath}.`);
+        return undefined;
+    }
+
+    return absolutePath;
 }
diff --git a/src/main.ts b/src/main.ts
index 9b8d9e42d..0e25b424e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -26,7 +26,6 @@ import { addJSONProviders } from './features/json/jsonContributions';
 import { ProjectStatusBarObserver } from './observers/projectStatusBarObserver';
 import { vscodeNetworkSettingsProvider } from './networkSettings';
 import { ErrorMessageObserver } from './observers/errorMessageObserver';
-import OptionProvider from './shared/observers/optionProvider';
 import DotNetTestChannelObserver from './observers/dotnetTestChannelObserver';
 import DotNetTestLoggerObserver from './observers/dotnetTestLoggerObserver';
 import createOptionStream from './shared/observables/createOptionStream';
@@ -39,12 +38,7 @@ import { installRuntimeDependencies } from './installRuntimeDependencies';
 import { isValidDownload } from './packageManager/isValidDownload';
 import { BackgroundWorkStatusBarObserver } from './observers/backgroundWorkStatusBarObserver';
 import { getDotnetPackApi } from './dotnetPack';
-import {
-    RoslynLanguageServer,
-    SolutionSnapshotProvider,
-    activateRoslynLanguageServer,
-    waitForProjectInitialization,
-} from './lsptoolshost/roslynLanguageServer';
+import { RoslynLanguageServer, activateRoslynLanguageServer } from './lsptoolshost/roslynLanguageServer';
 import { MigrateOptions } from './shared/migrateOptions';
 import { getBrokeredServiceContainer } from './lsptoolshost/services/brokeredServicesHosting';
 import { CSharpDevKitExports } from './csharpDevKitExports';
@@ -56,13 +50,18 @@ import { BlazorDebugConfigurationProvider } from './razor/src/blazorDebug/blazor
 import { RazorOmnisharpDownloader } from './razor/razorOmnisharpDownloader';
 import { RoslynLanguageServerExport } from './lsptoolshost/roslynLanguageServerExportChannel';
 import { registerOmnisharpOptionChanges } from './omnisharp/omnisharpOptionChanges';
+import { RoslynLanguageServerEvents } from './lsptoolshost/languageServerEvents';
+import { ServerStateChange } from './lsptoolshost/serverStateChange';
+import { SolutionSnapshotProvider } from './lsptoolshost/services/solutionSnapshotProvider';
+import { RazorTelemetryDownloader } from './razor/razorTelemetryDownloader';
+import { commonOptions, omnisharpOptions, razorOptions } from './shared/options';
+import { debugSessionTracker } from './coreclrDebug/provisionalDebugSessionTracker';
 
 export async function activate(
     context: vscode.ExtensionContext
 ): Promise<CSharpExtensionExports | OmnisharpExtensionExports | null> {
     await MigrateOptions(vscode);
     const optionStream = createOptionStream(vscode);
-    const optionProvider = new OptionProvider(optionStream);
 
     const eventStream = new EventStream();
 
@@ -85,12 +84,10 @@ export async function activate(
 
     const requiredPackageIds: string[] = ['Debugger'];
 
-    const razorOptions = optionProvider.GetLatestOptions().razorOptions;
     requiredPackageIds.push('Razor');
 
-    const csharpDevkitExtension = vscode.extensions.getExtension(csharpDevkitExtensionId);
-    const useOmnisharpServer =
-        !csharpDevkitExtension && optionProvider.GetLatestOptions().commonOptions.useOmnisharpServer;
+    const csharpDevkitExtension = getCSharpDevKit();
+    const useOmnisharpServer = !csharpDevkitExtension && commonOptions.useOmnisharpServer;
     if (useOmnisharpServer) {
         requiredPackageIds.push('OmniSharp');
     }
@@ -98,8 +95,10 @@ export async function activate(
     // If the dotnet bundle is installed, this will ensure the dotnet CLI is on the path.
     await initializeDotnetPath();
 
+    const useModernNetOption = omnisharpOptions.useModernNet;
+
     const networkSettingsProvider = vscodeNetworkSettingsProvider(vscode);
-    const useFramework = useOmnisharpServer && optionProvider.GetLatestOptions().omnisharpOptions.useModernNet !== true;
+    const useFramework = useOmnisharpServer && useModernNetOption !== true;
     const installDependencies: IInstallDependencies = async (dependencies: AbsolutePathPackage[]) =>
         downloadAndInstallPackages(dependencies, networkSettingsProvider, eventStream, isValidDownload);
     const runtimeDependenciesExist = await ensureRuntimeDependencies(
@@ -113,10 +112,28 @@ export async function activate(
 
     let omnisharpLangServicePromise: Promise<OmniSharp.ActivationResult> | undefined = undefined;
     let omnisharpRazorPromise: Promise<void> | undefined = undefined;
-    let roslynLanguageServerPromise: Promise<RoslynLanguageServer> | undefined = undefined;
+    const roslynLanguageServerEvents = new RoslynLanguageServerEvents();
+    context.subscriptions.push(roslynLanguageServerEvents);
+    let roslynLanguageServerStartedPromise: Promise<RoslynLanguageServer> | undefined = undefined;
+    let razorLanguageServerStartedPromise: Promise<void> | undefined = undefined;
     let projectInitializationCompletePromise: Promise<void> | undefined = undefined;
 
     if (!useOmnisharpServer) {
+        // Download Razor server telemetry bits if DevKit is installed.
+        if (csharpDevkitExtension) {
+            const razorTelemetryDownloader = new RazorTelemetryDownloader(
+                networkSettingsProvider,
+                eventStream,
+                context.extension.packageJSON,
+                platformInfo,
+                context.extension.extensionPath
+            );
+
+            await razorTelemetryDownloader.DownloadAndInstallRazorTelemetry(
+                context.extension.packageJSON.defaults.razorTelemetry
+            );
+        }
+
         // Activate Razor. Needs to be activated before Roslyn so commands are registered in the correct order.
         // Otherwise, if Roslyn starts up first, they could execute commands that don't yet exist on Razor's end.
         //
@@ -125,23 +142,33 @@ export async function activate(
         // Roslyn starts up and registers Razor-specific didOpen/didClose/didChange commands and sends request to Razor
         //     for dynamic file info once project system is ready ->
         // Razor sends didOpen commands to Roslyn for generated docs and responds to request with dynamic file info
-        await activateRazorExtension(
+        razorLanguageServerStartedPromise = activateRazorExtension(
             context,
             context.extension.extensionPath,
             eventStream,
+            csharpDevkitExtension,
+            platformInfo,
             /* useOmnisharpServer */ false
         );
 
-        context.subscriptions.push(optionProvider);
-        roslynLanguageServerPromise = activateRoslynLanguageServer(
+        // Setup a listener for project initialization complete before we start the server.
+        projectInitializationCompletePromise = new Promise((resolve, _) => {
+            roslynLanguageServerEvents.onServerStateChange(async (state) => {
+                if (state === ServerStateChange.ProjectInitializationComplete) {
+                    resolve();
+                }
+            });
+        });
+
+        // Start the server, but do not await the completion to avoid blocking activation.
+        roslynLanguageServerStartedPromise = activateRoslynLanguageServer(
             context,
             platformInfo,
-            optionProvider,
             optionStream,
             csharpChannel,
-            dotnetTestChannel
+            dotnetTestChannel,
+            roslynLanguageServerEvents
         );
-        projectInitializationCompletePromise = waitForProjectInitialization();
     } else {
         const dotnetChannel = vscode.window.createOutputChannel('.NET');
         const dotnetChannelObserver = new DotNetChannelObserver(dotnetChannel);
@@ -156,17 +183,17 @@ export async function activate(
 
         const omnisharpChannel = vscode.window.createOutputChannel('OmniSharp Log');
         const omnisharpLogObserver = new OmnisharpLoggerObserver(omnisharpChannel, platformInfo);
-        const omnisharpChannelObserver = new OmnisharpChannelObserver(omnisharpChannel, optionProvider);
+        const omnisharpChannelObserver = new OmnisharpChannelObserver(omnisharpChannel);
         eventStream.subscribe(omnisharpLogObserver.post);
         eventStream.subscribe(omnisharpChannelObserver.post);
 
         const warningMessageObserver = new WarningMessageObserver(
             vscode,
-            () => optionProvider.GetLatestOptions().omnisharpOptions.disableMSBuildDiagnosticWarning || false
+            () => omnisharpOptions.disableMSBuildDiagnosticWarning || false
         );
         eventStream.subscribe(warningMessageObserver.post);
 
-        const informationMessageObserver = new InformationMessageObserver(vscode, optionProvider);
+        const informationMessageObserver = new InformationMessageObserver(vscode);
         eventStream.subscribe(informationMessageObserver.post);
 
         const errorMessageObserver = new ErrorMessageObserver(vscode);
@@ -232,12 +259,10 @@ export async function activate(
             platformInfo,
             networkSettingsProvider,
             eventStream,
-            optionProvider,
             context.extension.extensionPath,
             omnisharpChannel
         );
 
-        context.subscriptions.push(optionProvider);
         context.subscriptions.push(registerOmnisharpOptionChanges(optionStream));
 
         // register JSON completion & hover providers for project.json
@@ -253,6 +278,8 @@ export async function activate(
                 context,
                 context.extension.extensionPath,
                 eventStream,
+                undefined,
+                platformInfo,
                 /* useOmnisharpServer */ true
             );
         }
@@ -289,26 +316,34 @@ export async function activate(
             context,
             platformInfo,
             eventStream,
-            csharpChannel,
-            optionProvider
+            csharpChannel
         );
     }
 
     if (!useOmnisharpServer) {
+        debugSessionTracker.initializeDebugSessionHandlers(context);
+
         tryGetCSharpDevKitExtensionExports(csharpLogObserver);
 
-        const languageServerExport = new RoslynLanguageServerExport(roslynLanguageServerPromise!);
+        // If we got here, the server should definitely have been created.
+        util.isNotNull(roslynLanguageServerStartedPromise);
+        util.isNotNull(projectInitializationCompletePromise);
+
+        const languageServerExport = new RoslynLanguageServerExport(roslynLanguageServerStartedPromise);
         return {
             initializationFinished: async () => {
                 await coreClrDebugPromise;
-                await roslynLanguageServerPromise;
+                await razorLanguageServerStartedPromise;
+                await roslynLanguageServerStartedPromise;
                 await projectInitializationCompletePromise;
             },
-            profferBrokeredServices: (container) => profferBrokeredServices(context, container),
+            profferBrokeredServices: (container) =>
+                profferBrokeredServices(context, container, roslynLanguageServerStartedPromise!),
             logDirectory: context.logUri.fsPath,
             determineBrowserType: BlazorDebugConfigurationProvider.determineBrowserType,
             experimental: {
                 sendServerRequest: async (t, p, ct) => await languageServerExport.sendRequest(t, p, ct),
+                languageServerEvents: roslynLanguageServerEvents,
             },
         };
     } else {
@@ -354,9 +389,9 @@ function tryGetCSharpDevKitExtensionExports(csharpLogObserver: CsharpLoggerObser
                 ]);
 
                 // Notify the vsdbg configuration provider that C# dev kit has been loaded.
-                exports.serverProcessLoaded(async () =>
-                    coreclrdebug.initializeBrokeredServicePipeName(await exports.getBrokeredServiceServerPipeName())
-                );
+                exports.serverProcessLoaded(async () => {
+                    debugSessionTracker.onCsDevKitInitialized(await exports.getBrokeredServiceServerPipeName());
+                });
 
                 vscode.commands.executeCommand('setContext', 'dotnet.debug.serviceBrokerAvailable', true);
             } else {
@@ -371,11 +406,15 @@ function tryGetCSharpDevKitExtensionExports(csharpLogObserver: CsharpLoggerObser
     );
 }
 
-function profferBrokeredServices(context: vscode.ExtensionContext, serviceContainer: GlobalBrokeredServiceContainer) {
+function profferBrokeredServices(
+    context: vscode.ExtensionContext,
+    serviceContainer: GlobalBrokeredServiceContainer,
+    languageServerPromise: Promise<RoslynLanguageServer>
+) {
     context.subscriptions.push(
         serviceContainer.profferServiceFactory(
             Descriptors.solutionSnapshotProviderRegistration,
-            (_mk, _op, _sb) => new SolutionSnapshotProvider()
+            (_mk, _op, _sb) => new SolutionSnapshotProvider(languageServerPromise)
         )
     );
 }
diff --git a/src/observers/informationMessageObserver.ts b/src/observers/informationMessageObserver.ts
index 58d958fd9..e68ee6b45 100644
--- a/src/observers/informationMessageObserver.ts
+++ b/src/observers/informationMessageObserver.ts
@@ -7,10 +7,10 @@ import * as ObservableEvent from '../omnisharp/loggingEvents';
 import { vscode } from '../vscodeAdapter';
 import showInformationMessage from '../shared/observers/utils/showInformationMessage';
 import { EventType } from '../omnisharp/eventType';
-import OptionProvider from '../shared/observers/optionProvider';
+import { omnisharpOptions } from '../shared/options';
 
 export class InformationMessageObserver {
-    constructor(private vscode: vscode, private optionProvider: OptionProvider) {}
+    constructor(private vscode: vscode) {}
 
     public post = (event: ObservableEvent.BaseEvent) => {
         switch (event.type) {
@@ -22,7 +22,7 @@ export class InformationMessageObserver {
 
     private async handleOmnisharpServerUnresolvedDependencies() {
         //to do: determine if we need the unresolved dependencies message
-        if (!this.optionProvider.GetLatestOptions().omnisharpOptions.suppressDotnetRestoreNotification) {
+        if (!omnisharpOptions.suppressDotnetRestoreNotification) {
             const message = `There are unresolved dependencies. Please execute the restore command to continue.`;
             return showInformationMessage(this.vscode, message, { title: 'Restore', command: 'dotnet.restore.all' });
         }
diff --git a/src/observers/omnisharpChannelObserver.ts b/src/observers/omnisharpChannelObserver.ts
index 3ab763dc3..d0b5f6930 100644
--- a/src/observers/omnisharpChannelObserver.ts
+++ b/src/observers/omnisharpChannelObserver.ts
@@ -7,10 +7,10 @@ import { BaseChannelObserver } from './baseChannelObserver';
 import { OutputChannel } from '../vscodeAdapter';
 import { BaseEvent } from '../omnisharp/loggingEvents';
 import { EventType } from '../omnisharp/eventType';
-import OptionProvider from '../shared/observers/optionProvider';
+import { omnisharpOptions } from '../shared/options';
 
 export class OmnisharpChannelObserver extends BaseChannelObserver {
-    constructor(channel: OutputChannel, private optionProvider: OptionProvider) {
+    constructor(channel: OutputChannel) {
         super(channel);
     }
 
@@ -30,7 +30,7 @@ export class OmnisharpChannelObserver extends BaseChannelObserver {
     };
 
     private async handleOmnisharpServerOnStdErr() {
-        if (this.optionProvider.GetLatestOptions().omnisharpOptions.showOmnisharpLogOnError) {
+        if (omnisharpOptions.showOmnisharpLogOnError) {
             this.showChannel(true);
         }
     }
diff --git a/src/omnisharp/decompilationPrompt.ts b/src/omnisharp/decompilationPrompt.ts
index 48a966b75..e4ae10676 100644
--- a/src/omnisharp/decompilationPrompt.ts
+++ b/src/omnisharp/decompilationPrompt.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import OptionProvider from '../shared/observers/optionProvider';
+import { omnisharpOptions } from '../shared/options';
 
 const DecompilationAuthorizedOption = 'csharp.decompilationAuthorized';
 
@@ -12,10 +12,9 @@ export async function resetDecompilationAuthorization(context: vscode.ExtensionC
     context.globalState.update(DecompilationAuthorizedOption, undefined);
 }
 
-export async function getDecompilationAuthorization(context: vscode.ExtensionContext, optionProvider: OptionProvider) {
+export async function getDecompilationAuthorization(context: vscode.ExtensionContext) {
     // If decompilation is disabled, then return false
-    const options = optionProvider.GetLatestOptions();
-    if (options.omnisharpOptions.enableDecompilationSupport === false) {
+    if (omnisharpOptions.enableDecompilationSupport === false) {
         return false;
     }
 
diff --git a/src/omnisharp/dotnetResolver.ts b/src/omnisharp/dotnetResolver.ts
index f71ce8c73..5d1c2ab4b 100644
--- a/src/omnisharp/dotnetResolver.ts
+++ b/src/omnisharp/dotnetResolver.ts
@@ -9,20 +9,21 @@ import * as semver from 'semver';
 import { promisify } from 'util';
 import { HostExecutableInformation } from '../shared/constants/hostExecutableInformation';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
-import { Options } from '../shared/options';
 import { PlatformInformation } from '../shared/platform';
+import { commonOptions } from '../shared/options';
 
 export class DotnetResolver implements IHostExecutableResolver {
     private readonly minimumDotnetVersion = '6.0.100';
 
     constructor(private platformInfo: PlatformInformation) {}
 
-    public async getHostExecutableInfo(options: Options): Promise<HostExecutableInformation> {
+    public async getHostExecutableInfo(): Promise<HostExecutableInformation> {
         const dotnet = this.platformInfo.isWindows() ? 'dotnet.exe' : 'dotnet';
         const env = { ...process.env };
 
-        if (options.commonOptions.dotnetPath.length > 0) {
-            env['PATH'] = options.commonOptions.dotnetPath + path.delimiter + env['PATH'];
+        const dotnetPathOption = commonOptions.dotnetPath;
+        if (dotnetPathOption.length > 0) {
+            env['PATH'] = dotnetPathOption + path.delimiter + env['PATH'];
         }
 
         // Test the dotnet exe for version
@@ -45,7 +46,7 @@ export class DotnetResolver implements IHostExecutableResolver {
 
         return {
             version: result.stdout,
-            path: options.commonOptions.dotnetPath,
+            path: dotnetPathOption,
             env,
         };
     }
diff --git a/src/omnisharp/engines/IEngine.ts b/src/omnisharp/engines/IEngine.ts
index 2a2863504..59b227686 100644
--- a/src/omnisharp/engines/IEngine.ts
+++ b/src/omnisharp/engines/IEngine.ts
@@ -5,21 +5,18 @@
 
 import { CancellationToken } from '../../vscodeAdapter';
 import { LaunchTarget } from '../../shared/launchTarget';
-import { Options } from '../../shared/options';
 import Disposable from '../../disposable';
 import { OmniSharpServer } from '../server';
 import { LanguageMiddlewareFeature } from '../languageMiddlewareFeature';
-import OptionProvider from '../../shared/observers/optionProvider';
 import { Advisor } from '../../features/diagnosticsProvider';
 import TestManager from '../../features/dotnetTest';
 import { EventStream } from '../../eventStream';
 
 export interface IEngine {
-    start(cwd: string, args: string[], launchTarget: LaunchTarget, launchPath: string, options: Options): Promise<void>;
+    start(cwd: string, args: string[], launchTarget: LaunchTarget, launchPath: string): Promise<void>;
     stop(): Promise<void>;
     registerProviders(
         server: OmniSharpServer,
-        optionProvider: OptionProvider,
         languageMiddlewareFeature: LanguageMiddlewareFeature,
         eventStream: EventStream,
         advisor: Advisor,
diff --git a/src/omnisharp/engines/lspEngine.ts b/src/omnisharp/engines/lspEngine.ts
index 9af149cd8..de0a3176d 100644
--- a/src/omnisharp/engines/lspEngine.ts
+++ b/src/omnisharp/engines/lspEngine.ts
@@ -8,7 +8,6 @@ import { CancellationToken } from '../../vscodeAdapter';
 import { configure } from '../launcher';
 import { LaunchTarget } from '../../shared/launchTarget';
 import { EventEmitter } from 'events';
-import { Options } from '../../shared/options';
 import { setTimeout } from 'timers';
 import * as ObservableEvents from '../loggingEvents';
 import { EventStream } from '../../eventStream';
@@ -24,7 +23,7 @@ import {
     Command,
     DynamicFeature,
     LanguageClientOptions,
-    RequestType0,
+    RequestType,
     StaticFeature,
     Trace,
 } from 'vscode-languageclient';
@@ -34,7 +33,6 @@ import { ColorProviderFeature } from 'vscode-languageclient/lib/common/colorProv
 import { WorkspaceFoldersFeature } from 'vscode-languageclient/lib/common/workspaceFolder';
 import { DeclarationFeature } from 'vscode-languageclient/lib/common/declaration';
 import { DocumentLinkFeature } from 'vscode-languageclient/lib/common/documentLink';
-import { InlayHintsFeature } from 'vscode-languageclient/lib/common/inlayHint';
 import { InlineValueFeature } from 'vscode-languageclient/lib/common/inlineValue';
 import { DiagnosticFeature } from 'vscode-languageclient/lib/common/diagnostic';
 import { NotebookDocumentSyncFeature } from 'vscode-languageclient/lib/common/notebook';
@@ -42,7 +40,6 @@ import { TypeHierarchyFeature } from 'vscode-languageclient/lib/common/typeHiera
 import { CallHierarchyFeature } from 'vscode-languageclient/lib/common/callHierarchy';
 import { Advisor } from '../../features/diagnosticsProvider';
 import dotnetTest from '../../features/dotnetTest';
-import OptionProvider from '../../shared/observers/optionProvider';
 
 export class LspEngine implements IEngine {
     client: LanguageClient | undefined;
@@ -60,19 +57,12 @@ export class LspEngine implements IEngine {
 
     private _initializeTask: Promise<void> | undefined;
 
-    public async start(
-        cwd: string,
-        args: string[],
-        launchTarget: LaunchTarget,
-        launchPath: string,
-        options: Options
-    ): Promise<void> {
+    public async start(cwd: string, args: string[], launchTarget: LaunchTarget, launchPath: string): Promise<void> {
         const configuration = await configure(
             cwd,
             ['-lsp', '--encoding', 'ascii'].concat(args),
             launchPath,
             this.platformInfo,
-            options,
             this.monoResolver,
             this.dotnetResolver
         );
@@ -249,6 +239,10 @@ export class LspEngine implements IEngine {
                     const result = await next(document, position, token);
                     return result;
                 },
+                async provideInlayHints(document, range, token, next) {
+                    const result = await next(document, range, token);
+                    return result;
+                },
             },
         };
 
@@ -282,7 +276,7 @@ export class LspEngine implements IEngine {
         //disableFeature(FoldingRangeFeature);
         //disableFeature(HoverFeature); // This feature does not always seem to be working. Wonder if requests are coming in too early.
         //disableFeature(ImplementationFeature); // Needs metadata document/source generated document support
-        disableFeature(InlayHintsFeature); // The csharp-language-server-protocol library needs to update with 3.17 changes
+        //disableFeature(InlayHintsFeature); // The csharp-language-server-protocol library needs to update with 3.17 changes
         disableFeature(InlineValueFeature); // Not implemented in O#
         disableFeature(NotebookDocumentSyncFeature); // Not implemented in O#
         //disableFeature(ReferencesFeature); // Needs metadata document/source generated document support
@@ -316,7 +310,6 @@ export class LspEngine implements IEngine {
 
     async registerProviders(
         _server: OmniSharpServer,
-        _optionProvider: OptionProvider,
         _languageMiddlewareFeature: LanguageMiddlewareFeature,
         _eventStream: EventStream,
         _advisor: Advisor,
@@ -342,8 +335,8 @@ export class LspEngine implements IEngine {
         return this._initializeTask;
 
         async function waitForReady(client: LanguageClient) {
-            const statusRequest = new RequestType0<boolean, void>('o#/checkreadystatus');
-            while (!(await client.sendRequest(statusRequest))) {
+            const statusRequest = new RequestType<object, boolean, void>('o#/checkreadystatus');
+            while (!(await client.sendRequest(statusRequest, {}))) {
                 await new Promise((r) => setTimeout(r, 100));
             }
         }
diff --git a/src/omnisharp/engines/stdioEngine.ts b/src/omnisharp/engines/stdioEngine.ts
index 0fdf79a5c..b6d5889ae 100644
--- a/src/omnisharp/engines/stdioEngine.ts
+++ b/src/omnisharp/engines/stdioEngine.ts
@@ -11,7 +11,7 @@ import { LaunchTarget } from '../../shared/launchTarget';
 import { ReadLine, createInterface } from 'readline';
 import { Request, RequestQueueCollection } from '../requestQueue';
 import { EventEmitter } from 'events';
-import { Options } from '../../shared/options';
+import { omnisharpOptions } from '../../shared/options';
 import { PlatformInformation } from '../../shared/platform';
 import { launchOmniSharp } from '../launcher';
 import { setTimeout } from 'timers';
@@ -46,7 +46,6 @@ import OmniSharpCodeActionProvider from '../../features/codeActionProvider';
 import forwardChanges from '../../features/changeForwarding';
 import OmniSharpDefinitionProvider from '../../features/definitionProvider';
 import reportDiagnostics, { Advisor } from '../../features/diagnosticsProvider';
-import OptionProvider from '../../shared/observers/optionProvider';
 import { LanguageMiddlewareFeature } from '../languageMiddlewareFeature';
 import TestManager from '../../features/dotnetTest';
 import { OmniSharpStructureProvider } from '../../features/structureProvider';
@@ -74,7 +73,6 @@ export class StdioEngine implements IEngine {
 
     async registerProviders(
         server: OmniSharpServer,
-        optionProvider: OptionProvider,
         languageMiddlewareFeature: LanguageMiddlewareFeature,
         eventStream: EventStream,
         advisor: Advisor,
@@ -84,8 +82,6 @@ export class StdioEngine implements IEngine {
             language: 'csharp',
         };
 
-        const options = optionProvider.GetLatestOptions();
-
         // register language feature provider on start
         const localDisposables = new CompositeDisposable();
 
@@ -100,7 +96,7 @@ export class StdioEngine implements IEngine {
         localDisposables.add(
             vscode.languages.registerCodeLensProvider(
                 documentSelector,
-                new OmniSharpCodeLensProvider(server, testManager, optionProvider, languageMiddlewareFeature)
+                new OmniSharpCodeLensProvider(server, testManager, languageMiddlewareFeature)
             )
         );
         localDisposables.add(
@@ -127,7 +123,7 @@ export class StdioEngine implements IEngine {
                 new OmniSharpRenameProvider(server, languageMiddlewareFeature)
             )
         );
-        if (options.omnisharpOptions.useFormatting) {
+        if (omnisharpOptions.useFormatting) {
             localDisposables.add(
                 vscode.languages.registerDocumentRangeFormattingEditProvider(
                     documentSelector,
@@ -156,12 +152,7 @@ export class StdioEngine implements IEngine {
         );
         localDisposables.add(
             vscode.languages.registerWorkspaceSymbolProvider(
-                new OmniSharpWorkspaceSymbolProvider(
-                    server,
-                    optionProvider,
-                    languageMiddlewareFeature,
-                    sourceGeneratedDocumentProvider
-                )
+                new OmniSharpWorkspaceSymbolProvider(server, languageMiddlewareFeature, sourceGeneratedDocumentProvider)
             )
         );
         localDisposables.add(
@@ -183,7 +174,7 @@ export class StdioEngine implements IEngine {
                 OmniSharpFixAllProvider.metadata
             )
         );
-        localDisposables.add(reportDiagnostics(server, advisor, languageMiddlewareFeature, optionProvider));
+        localDisposables.add(reportDiagnostics(server, advisor, languageMiddlewareFeature));
 
         const definitionProvider = new OmniSharpDefinitionProvider(
             server,
@@ -221,7 +212,7 @@ export class StdioEngine implements IEngine {
         localDisposables.add(forwardChanges(server));
         // Since the CodeActionProvider registers its own commands, we must instantiate it and add it to the localDisposables
         // so that it will be cleaned up if OmniSharp is restarted.
-        const codeActionProvider = new OmniSharpCodeActionProvider(server, optionProvider, languageMiddlewareFeature);
+        const codeActionProvider = new OmniSharpCodeActionProvider(server, languageMiddlewareFeature);
         localDisposables.add(codeActionProvider);
         localDisposables.add(vscode.languages.registerCodeActionsProvider(documentSelector, codeActionProvider));
 
@@ -234,11 +225,7 @@ export class StdioEngine implements IEngine {
         );
         localDisposables.add(fileOpenClose(server));
 
-        const semanticTokensProvider = new OmniSharpSemanticTokensProvider(
-            server,
-            optionProvider,
-            languageMiddlewareFeature
-        );
+        const semanticTokensProvider = new OmniSharpSemanticTokensProvider(server, languageMiddlewareFeature);
         localDisposables.add(
             vscode.languages.registerDocumentSemanticTokensProvider(
                 documentSelector,
@@ -317,19 +304,12 @@ export class StdioEngine implements IEngine {
         return new Disposable(() => this._eventBus.removeListener(event, listener));
     }
 
-    public async start(
-        cwd: string,
-        args: string[],
-        launchTarget: LaunchTarget,
-        launchPath: string,
-        options: Options
-    ): Promise<void> {
+    public async start(cwd: string, args: string[], launchTarget: LaunchTarget, launchPath: string): Promise<void> {
         const launchResult = await launchOmniSharp(
             cwd,
             args.concat('--encoding', 'utf-8'),
             launchPath,
             this.platformInfo,
-            options,
             this.monoResolver,
             this.dotnetResolver
         );
@@ -367,7 +347,7 @@ export class StdioEngine implements IEngine {
             let listener: Disposable;
 
             // Convert the timeout from the seconds to milliseconds, which is required by setTimeout().
-            const timeoutDuration = options.omnisharpOptions.projectLoadTimeout * 1000;
+            const timeoutDuration = omnisharpOptions.projectLoadTimeout * 1000;
 
             // timeout logic
             const handle = setTimeout(() => {
diff --git a/src/omnisharp/extension.ts b/src/omnisharp/extension.ts
index 943d71569..c1cc041dd 100644
--- a/src/omnisharp/extension.ts
+++ b/src/omnisharp/extension.ts
@@ -17,7 +17,6 @@ import { EventStream } from '../eventStream';
 import { NetworkSettingsProvider } from '../networkSettings';
 import CompositeDisposable from '../compositeDisposable';
 import Disposable from '../disposable';
-import OptionProvider from '../shared/observers/optionProvider';
 import { OmniSharpMonoResolver } from './omniSharpMonoResolver';
 import { getMonoVersion } from '../utils/getMonoVersion';
 import { LanguageMiddlewareFeature } from './languageMiddlewareFeature';
@@ -25,6 +24,7 @@ import { getDecompilationAuthorization } from './decompilationPrompt';
 import { DotnetResolver } from './dotnetResolver';
 import { Advisor } from '../features/diagnosticsProvider';
 import { OmnisharpWorkspaceDebugInformationProvider } from '../omnisharpWorkspaceDebugInformationProvider';
+import { omnisharpOptions, razorOptions } from '../shared/options';
 
 export interface ActivationResult {
     readonly server: OmniSharpServer;
@@ -38,13 +38,11 @@ export async function activate(
     platformInfo: PlatformInformation,
     provider: NetworkSettingsProvider,
     eventStream: EventStream,
-    optionProvider: OptionProvider,
     extensionPath: string,
     outputChannel: vscode.OutputChannel
 ) {
     const disposables = new CompositeDisposable();
 
-    const options = optionProvider.GetLatestOptions();
     const omnisharpMonoResolver = new OmniSharpMonoResolver(getMonoVersion);
     const omnisharpDotnetResolver = new DotnetResolver(platformInfo);
 
@@ -52,7 +50,7 @@ export async function activate(
     languageMiddlewareFeature.register();
     disposables.add(languageMiddlewareFeature);
 
-    const decompilationAuthorized = await getDecompilationAuthorization(context, optionProvider);
+    const decompilationAuthorized = await getDecompilationAuthorization(context);
 
     const server = new OmniSharpServer(
         vscode,
@@ -60,7 +58,6 @@ export async function activate(
         packageJSON,
         platformInfo,
         eventStream,
-        optionProvider,
         extensionPath,
         omnisharpMonoResolver,
         omnisharpDotnetResolver,
@@ -69,8 +66,8 @@ export async function activate(
         outputChannel,
         languageMiddlewareFeature
     );
-    const advisor = new Advisor(server, optionProvider); // create before server is started
-    const testManager = new TestManager(optionProvider, server, eventStream, languageMiddlewareFeature);
+    const advisor = new Advisor(server); // create before server is started
+    const testManager = new TestManager(server, eventStream, languageMiddlewareFeature);
     const workspaceInformationProvider = new OmnisharpWorkspaceDebugInformationProvider(server);
 
     let registrations: Disposable | undefined;
@@ -94,7 +91,6 @@ export async function activate(
             server,
             platformInfo,
             eventStream,
-            optionProvider,
             omnisharpMonoResolver,
             omnisharpDotnetResolver,
             workspaceInformationProvider
@@ -163,7 +159,7 @@ export async function activate(
 
     disposables.add(
         server.onBeforeServerStart((path) => {
-            if (options.razorOptions.razorDevMode) {
+            if (razorOptions.razorDevMode) {
                 eventStream.post(new RazorDevModeActive());
             }
 
@@ -172,7 +168,7 @@ export async function activate(
         })
     );
 
-    if (options.omnisharpOptions.autoStart) {
+    if (omnisharpOptions.autoStart) {
         server.autoStart(context.workspaceState.get<string>('lastSolutionPathOrFolder', ''));
     }
 
@@ -189,12 +185,7 @@ export async function activate(
     disposables.add(
         vscode.debug.registerDebugConfigurationProvider(
             'coreclr',
-            new DotnetWorkspaceConfigurationProvider(
-                workspaceInformationProvider,
-                platformInfo,
-                optionProvider,
-                outputChannel
-            )
+            new DotnetWorkspaceConfigurationProvider(workspaceInformationProvider, platformInfo, outputChannel)
         )
     );
 
diff --git a/src/omnisharp/launcher.ts b/src/omnisharp/launcher.ts
index 0fa7c2018..b239ab332 100644
--- a/src/omnisharp/launcher.ts
+++ b/src/omnisharp/launcher.ts
@@ -9,7 +9,7 @@ import { ChildProcessWithoutNullStreams } from 'child_process';
 import { PlatformInformation } from '../shared/platform';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { Options } from '../shared/options';
+import { commonOptions, omnisharpOptions } from '../shared/options';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 import { LaunchTarget, LaunchTargetKind, createLaunchTargetForSolution } from '../shared/launchTarget';
 
@@ -35,14 +35,14 @@ export const disabledSchemes = new Set([vsls]);
  * (if it doesn't contain a `project.json` file, but `project.json` files exist). In addition, the root folder
  * is included if there are any `*.csproj` files present, but a `*.sln` or `*.slnf` file is not found.
  */
-export async function findLaunchTargets(options: Options): Promise<LaunchTarget[]> {
+export async function findLaunchTargets(): Promise<LaunchTarget[]> {
     if (!vscode.workspace.workspaceFolders) {
         return Promise.resolve([]);
     }
 
     const projectFiles = await vscode.workspace.findFiles(
         /*include*/ '{**/*.sln,**/*.slnf,**/*.csproj,**/project.json,**/*.csx,**/*.cake}',
-        /*exclude*/ `{${options.omnisharpOptions.projectFilesExcludePattern}}`
+        /*exclude*/ `{${omnisharpOptions.projectFilesExcludePattern}}`
     );
 
     const csFiles = await vscode.workspace.findFiles(
@@ -54,7 +54,7 @@ export async function findLaunchTargets(options: Options): Promise<LaunchTarget[
     return resourcesToLaunchTargets(
         projectFiles.concat(csFiles),
         vscode.workspace.workspaceFolders,
-        options.omnisharpOptions.maxProjectResults
+        omnisharpOptions.maxProjectResults
     );
 }
 
@@ -298,12 +298,11 @@ export async function launchOmniSharp(
     args: string[],
     launchPath: string,
     platformInfo: PlatformInformation,
-    options: Options,
     monoResolver: IHostExecutableResolver,
     dotnetResolver: IHostExecutableResolver
 ): Promise<LaunchResult> {
     return new Promise((resolve, reject) => {
-        launch(cwd, args, launchPath, platformInfo, options, monoResolver, dotnetResolver)
+        launch(cwd, args, launchPath, platformInfo, monoResolver, dotnetResolver)
             .then((result) => {
                 // async error - when target not not ENEOT
                 result.process.on('error', (err) => {
@@ -323,11 +322,10 @@ export async function configure(
     args: string[],
     launchPath: string,
     platformInfo: PlatformInformation,
-    options: Options,
     monoResolver: IHostExecutableResolver,
     dotnetResolver: IHostExecutableResolver
 ): Promise<LaunchConfiguration> {
-    if (options.omnisharpOptions.useEditorFormattingSettings) {
+    if (omnisharpOptions.useEditorFormattingSettings) {
         const globalConfig = vscode.workspace.getConfiguration('', null);
         const csharpConfig = vscode.workspace.getConfiguration('[csharp]', null);
 
@@ -352,7 +350,7 @@ export async function configure(
         );
     }
 
-    if (options.omnisharpOptions.useModernNet) {
+    if (omnisharpOptions.useModernNet) {
         const argsCopy = args.slice(0);
 
         let command: string;
@@ -364,7 +362,7 @@ export async function configure(
             argsCopy.unshift(launchPath);
         }
 
-        const dotnetInfo = await dotnetResolver.getHostExecutableInfo(options);
+        const dotnetInfo = await dotnetResolver.getHostExecutableInfo();
 
         return {
             hostKind: '.NET',
@@ -391,13 +389,13 @@ export async function configure(
         };
     }
 
-    const monoInfo = await monoResolver.getHostExecutableInfo(options);
+    const monoInfo = await monoResolver.getHostExecutableInfo();
     if (monoInfo !== undefined) {
         const argsCopy = args.slice(0); // create copy of details args
         argsCopy.unshift(launchPath);
         argsCopy.unshift('--assembly-loader=strict');
 
-        if (options.commonOptions.waitForDebugger) {
+        if (commonOptions.waitForDebugger) {
             argsCopy.unshift('--debug');
             argsCopy.unshift('--debugger-agent=transport=dt_socket,server=y,address=127.0.0.1:55555');
         }
@@ -422,19 +420,10 @@ async function launch(
     args: string[],
     launchPath: string,
     platformInfo: PlatformInformation,
-    options: Options,
     monoResolver: IHostExecutableResolver,
     dotnetResolver: IHostExecutableResolver
 ): Promise<IntermediateLaunchResult> {
-    const configureResults = await configure(
-        cwd,
-        args,
-        launchPath,
-        platformInfo,
-        options,
-        monoResolver,
-        dotnetResolver
-    );
+    const configureResults = await configure(cwd, args, launchPath, platformInfo, monoResolver, dotnetResolver);
     return coreLaunch(platformInfo, configureResults);
 }
 
diff --git a/src/omnisharp/omniSharpMonoResolver.ts b/src/omnisharp/omniSharpMonoResolver.ts
index 6e240e1fb..6e3df3434 100644
--- a/src/omnisharp/omniSharpMonoResolver.ts
+++ b/src/omnisharp/omniSharpMonoResolver.ts
@@ -8,24 +8,25 @@ import * as path from 'path';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 import { HostExecutableInformation } from '../shared/constants/hostExecutableInformation';
 import { IGetMonoVersion } from '../constants/IGetMonoVersion';
-import { Options } from '../shared/options';
+import { omnisharpOptions } from '../shared/options';
 
 export class OmniSharpMonoResolver implements IHostExecutableResolver {
     private readonly minimumMonoVersion = '6.4.0';
 
     constructor(private getMonoVersion: IGetMonoVersion) {}
 
-    public async getHostExecutableInfo(options: Options): Promise<HostExecutableInformation> {
+    public async getHostExecutableInfo(): Promise<HostExecutableInformation> {
         const env = { ...process.env };
 
-        if (options.omnisharpOptions.monoPath.length > 0) {
-            env['PATH'] = path.join(options.omnisharpOptions.monoPath, 'bin') + path.delimiter + env['PATH'];
-            env['MONO_GAC_PREFIX'] = options.omnisharpOptions.monoPath;
+        const monoPath = omnisharpOptions.monoPath;
+        if (monoPath.length > 0) {
+            env['PATH'] = path.join(monoPath, 'bin') + path.delimiter + env['PATH'];
+            env['MONO_GAC_PREFIX'] = monoPath;
         }
 
         const monoVersion = await this.getMonoVersion(env);
         if (monoVersion === undefined) {
-            const suggestedAction = options.omnisharpOptions.monoPath
+            const suggestedAction = monoPath
                 ? "Update the \"omnisharp.monoPath\" setting to point to the folder containing Mono's '/bin' folder."
                 : "Ensure that Mono's '/bin' folder is added to your environment's PATH variable.";
             throw new Error(`Unable to find Mono. ${suggestedAction}`);
@@ -39,7 +40,7 @@ export class OmniSharpMonoResolver implements IHostExecutableResolver {
 
         return {
             version: monoVersion,
-            path: options.omnisharpOptions.monoPath,
+            path: monoPath,
             env,
         };
     }
diff --git a/src/omnisharp/omnisharpOptionChanges.ts b/src/omnisharp/omnisharpOptionChanges.ts
index 73297b2ed..7b56b8eb7 100644
--- a/src/omnisharp/omnisharpOptionChanges.ts
+++ b/src/omnisharp/omnisharpOptionChanges.ts
@@ -5,12 +5,12 @@
 
 import * as vscode from 'vscode';
 import { HandleOptionChanges, OptionChangeObserver } from '../shared/observers/optionChangeObserver';
-import { CommonOptionsThatTriggerReload, OmnisharpOptionsThatTriggerReload, Options } from '../shared/options';
+import { CommonOptionsThatTriggerReload, OmnisharpOptionsThatTriggerReload } from '../shared/options';
 import ShowInformationMessage from '../shared/observers/utils/showInformationMessage';
 import { Observable } from 'rxjs';
 import Disposable from '../disposable';
 
-export function registerOmnisharpOptionChanges(optionObservable: Observable<Options>): Disposable {
+export function registerOmnisharpOptionChanges(optionObservable: Observable<void>): Disposable {
     const optionChangeObserver: OptionChangeObserver = {
         getRelevantOptions: () => {
             return {
diff --git a/src/omnisharp/requirementCheck.ts b/src/omnisharp/requirementCheck.ts
index 781044c6d..4b3282569 100644
--- a/src/omnisharp/requirementCheck.ts
+++ b/src/omnisharp/requirementCheck.ts
@@ -6,10 +6,10 @@
 import * as vscode from 'vscode';
 import * as semver from 'semver';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
-import { Options } from '../shared/options';
 import { getMonoVersion } from '../utils/getMonoVersion';
 import { OmniSharpMonoResolver } from './omniSharpMonoResolver';
 import { getMSBuildVersion } from '../utils/getMsBuildInfo';
+import { omnisharpOptions } from '../shared/options';
 
 export interface RequirementResult {
     needsDotNetSdk: boolean;
@@ -17,8 +17,8 @@ export interface RequirementResult {
     needsMSBuildTools: boolean;
 }
 
-export async function validateRequirements(options: Options): Promise<boolean> {
-    const result = await checkRequirements(options);
+export async function validateRequirements(): Promise<boolean> {
+    const result = await checkRequirements();
 
     if (result.needsDotNetSdk) {
         const downloadSdk = await promptToDownloadDotNetSDK();
@@ -51,9 +51,9 @@ export async function validateRequirements(options: Options): Promise<boolean> {
     return true;
 }
 
-async function checkRequirements(options: Options): Promise<RequirementResult> {
-    if (options.omnisharpOptions.useModernNet) {
-        const dotnetInfo = await getDotnetInfo(options.omnisharpOptions.dotNetCliPaths);
+async function checkRequirements(): Promise<RequirementResult> {
+    if (omnisharpOptions.useModernNet) {
+        const dotnetInfo = await getDotnetInfo(omnisharpOptions.dotNetCliPaths);
         const needsDotNetSdk = dotnetInfo.Version === undefined || semver.lt(dotnetInfo.Version, '6.0.0');
         return {
             needsDotNetSdk,
@@ -73,7 +73,7 @@ async function checkRequirements(options: Options): Promise<RequirementResult> {
         const monoResolver = new OmniSharpMonoResolver(getMonoVersion);
         let monoError = false;
         try {
-            await monoResolver.getHostExecutableInfo(options);
+            await monoResolver.getHostExecutableInfo();
         } catch (e) {
             monoError = true;
         }
diff --git a/src/omnisharp/server.ts b/src/omnisharp/server.ts
index b55c0f4f8..8163b1d66 100644
--- a/src/omnisharp/server.ts
+++ b/src/omnisharp/server.ts
@@ -21,7 +21,6 @@ import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import CompositeDisposable from '../compositeDisposable';
 import Disposable from '../disposable';
-import OptionProvider from '../shared/observers/optionProvider';
 import { ExtensionContext, OutputChannel } from 'vscode';
 import { LanguageMiddlewareFeature } from './languageMiddlewareFeature';
 import { LspEngine } from './engines/lspEngine';
@@ -34,6 +33,7 @@ import { Advisor } from '../features/diagnosticsProvider';
 import TestManager from '../features/dotnetTest';
 import { findLaunchTargets } from './launcher';
 import { ProjectConfigurationMessage } from '../shared/projectConfiguration';
+import { commonOptions, omnisharpOptions, razorOptions } from '../shared/options';
 
 enum ServerState {
     Starting,
@@ -112,7 +112,6 @@ export class OmniSharpServer {
         private packageJSON: any,
         private platformInfo: PlatformInformation,
         private eventStream: EventStream,
-        private optionProvider: OptionProvider,
         private extensionPath: string,
         private monoResolver: IHostExecutableResolver,
         private dotnetResolver: IHostExecutableResolver,
@@ -299,9 +298,7 @@ export class OmniSharpServer {
             return;
         }
 
-        const options = this.optionProvider.GetLatestOptions();
-
-        if (!(await validateRequirements(options))) {
+        if (!(await validateRequirements())) {
             this.eventStream.post(
                 new ObservableEvents.OmnisharpServerMessage(
                     'OmniSharp failed to start because of missing requirements.'
@@ -313,7 +310,6 @@ export class OmniSharpServer {
         const disposables = new CompositeDisposable();
 
         let engine: IEngine | undefined;
-        const omnisharpOptions = options.omnisharpOptions;
         if (omnisharpOptions.enableLspDriver) {
             engine = new LspEngine(
                 this._eventBus,
@@ -416,7 +412,7 @@ export class OmniSharpServer {
         const solutionPath = launchTarget.target;
         const cwd = path.dirname(solutionPath);
 
-        const args = [
+        const args: string[] = [
             '-z',
             '-s',
             solutionPath,
@@ -427,11 +423,11 @@ export class OmniSharpServer {
             omnisharpOptions.loggingLevel,
         ];
 
-        const razorOptions = options.razorOptions;
+        const razorPluginPathOption = razorOptions.razorPluginPath;
         // Razor support only exists for certain platforms, so only load the plugin if present
         const razorPluginPath =
-            razorOptions.razorPluginPath.length > 0
-                ? razorOptions.razorPluginPath
+            razorPluginPathOption.length > 0
+                ? razorPluginPathOption
                 : path.join(
                       this.extensionPath,
                       '.razoromnisharp',
@@ -442,12 +438,13 @@ export class OmniSharpServer {
             args.push('--plugin', razorPluginPath);
         }
 
-        if (options.commonOptions.waitForDebugger === true) {
+        if (commonOptions.waitForDebugger === true) {
             args.push('--debug');
         }
 
-        for (let i = 0; i < options.commonOptions.excludePaths.length; i++) {
-            args.push(`FileOptions:SystemExcludeSearchPatterns:${i}=${options.commonOptions.excludePaths[i]}`);
+        const excludePath = commonOptions.excludePaths;
+        for (let i = 0; i < excludePath.length; i++) {
+            args.push(`FileOptions:SystemExcludeSearchPatterns:${i}=${excludePath[i]}`);
         }
 
         if (omnisharpOptions.enableMsBuildLoadProjectsOnDemand === true) {
@@ -478,21 +475,24 @@ export class OmniSharpServer {
             args.push('RoslynExtensionsOptions:EnableAsyncCompletion=true');
         }
 
-        if (omnisharpOptions.sdkPath.length > 0) {
-            args.push(`Sdk:Path=${omnisharpOptions.sdkPath}`);
+        const sdkPath = omnisharpOptions.sdkPath;
+        if (sdkPath.length > 0) {
+            args.push(`Sdk:Path=${sdkPath}`);
         }
 
-        if (omnisharpOptions.sdkVersion.length > 0) {
-            args.push(`Sdk:Version=${omnisharpOptions.sdkVersion}`);
+        const sdkVersion = omnisharpOptions.sdkVersion;
+        if (sdkVersion.length > 0) {
+            args.push(`Sdk:Version=${sdkVersion}`);
         }
 
         if (omnisharpOptions.sdkIncludePrereleases) {
             args.push(`Sdk:IncludePrereleases=true`);
         }
 
-        if (omnisharpOptions.inlayHintsEnableForParameters === true) {
+        const enableInlayHintsForParameters = omnisharpOptions.inlayHintsEnableForParameters;
+        if (enableInlayHintsForParameters === true) {
             args.push(
-                `RoslynExtensionsOptions:InlayHintsOptions:EnableForParameters=${omnisharpOptions.inlayHintsEnableForParameters.toString()}`
+                `RoslynExtensionsOptions:InlayHintsOptions:EnableForParameters=${enableInlayHintsForParameters.toString()}`
             );
             args.push(
                 `RoslynExtensionsOptions:InlayHintsOptions:ForLiteralParameters=${omnisharpOptions.inlayHintsForLiteralParameters.toString()}`
@@ -517,9 +517,10 @@ export class OmniSharpServer {
             );
         }
 
-        if (omnisharpOptions.inlayHintsEnableForTypes === true) {
+        const enableInlayHintsForTypes = omnisharpOptions.inlayHintsEnableForTypes;
+        if (enableInlayHintsForTypes === true) {
             args.push(
-                `RoslynExtensionsOptions:InlayHintsOptions:EnableForTypes=${omnisharpOptions.inlayHintsEnableForTypes.toString()}`
+                `RoslynExtensionsOptions:InlayHintsOptions:EnableForTypes=${enableInlayHintsForTypes.toString()}`
             );
             args.push(
                 `RoslynExtensionsOptions:InlayHintsOptions:ForImplicitVariableTypes=${omnisharpOptions.inlayHintsForImplicitVariableTypes.toString()}`
@@ -536,15 +537,16 @@ export class OmniSharpServer {
             args.push('RoslynExtensionsOptions:AnalyzeOpenDocumentsOnly=true');
         }
 
-        for (let i = 0; i < omnisharpOptions.dotNetCliPaths.length; i++) {
-            args.push(`DotNetCliOptions:LocationPaths:${i}=${omnisharpOptions.dotNetCliPaths[i]}`);
+        const dotnetCliPaths = omnisharpOptions.dotNetCliPaths;
+        for (let i = 0; i < dotnetCliPaths.length; i++) {
+            args.push(`DotNetCliOptions:LocationPaths:${i}=${dotnetCliPaths[i]}`);
         }
 
         let launchPath: string;
         try {
             launchPath = await this._omnisharpManager.GetOmniSharpLaunchPath(
                 this.packageJSON.defaults.omniSharp,
-                options.commonOptions.serverPath,
+                commonOptions.serverPath,
                 /* useFramework */ !omnisharpOptions.useModernNet,
                 this.extensionPath
             );
@@ -559,13 +561,11 @@ export class OmniSharpServer {
             return;
         }
 
-        this.eventStream.post(
-            new ObservableEvents.OmnisharpInitialisation(omnisharpOptions.dotNetCliPaths, new Date(), solutionPath)
-        );
+        this.eventStream.post(new ObservableEvents.OmnisharpInitialisation(dotnetCliPaths, new Date(), solutionPath));
         this._fireEvent(Events.BeforeServerStart, solutionPath);
 
         try {
-            await engine.start(cwd, args, launchTarget, launchPath, options);
+            await engine.start(cwd, args, launchTarget, launchPath);
 
             this._setState({
                 status: ServerState.Started,
@@ -602,14 +602,7 @@ export class OmniSharpServer {
         }
 
         const { engine } = this._state;
-        return await engine.registerProviders(
-            this,
-            this.optionProvider,
-            this.languageMiddlewareFeature,
-            eventStream,
-            advisor,
-            testManager
-        );
+        return await engine.registerProviders(this, this.languageMiddlewareFeature, eventStream, advisor, testManager);
     }
 
     private onProjectConfigurationReceived(listener: (e: ProjectConfigurationMessage) => void) {
@@ -678,8 +671,7 @@ export class OmniSharpServer {
     }
 
     public async autoStart(preferredPath: string): Promise<void> {
-        const options = this.optionProvider.GetLatestOptions();
-        const launchTargets = await findLaunchTargets(options);
+        const launchTargets = await findLaunchTargets();
 
         // If there aren't any potential launch targets, we create file watcher and try to
         // start the server again once a *.sln, *.slnf, *.csproj, project.json, CSX or Cake file is created.
@@ -707,7 +699,7 @@ export class OmniSharpServer {
         }
 
         // First, try to launch against something that matches the user's preferred target
-        const defaultLaunchSolutionConfigValue = this.optionProvider.GetLatestOptions().commonOptions.defaultSolution;
+        const defaultLaunchSolutionConfigValue = commonOptions.defaultSolution;
         const defaultLaunchSolutionTarget = launchTargets.find(
             (a) => path.basename(a.target) === defaultLaunchSolutionConfigValue
         );
diff --git a/src/omnisharpWorkspaceDebugInformationProvider.ts b/src/omnisharpWorkspaceDebugInformationProvider.ts
index 94653f88a..76c035b0b 100644
--- a/src/omnisharpWorkspaceDebugInformationProvider.ts
+++ b/src/omnisharpWorkspaceDebugInformationProvider.ts
@@ -44,11 +44,12 @@ export class OmnisharpWorkspaceDebugInformationProvider implements IWorkspaceDeb
          * Note: serverUtils.requestWorkspaceInformation only retrieves one folder for multi-root workspaces. Therefore, generator will be incorrect for all folders
          * except the first in a workspace. Currently, this only works if the requested folder is the same as the server's solution path or folder.
          */
-        return projects?.filter((p) => {
+        const projectsInWorkspace = projects?.filter((p) => {
             // Get absolute paths of current folder and server folder.
             const workspaceFolder = path.resolve(workspacePath.fsPath);
             const projectFolder = path.dirname(p.projectPath);
             return isSubfolderOf(projectFolder, workspaceFolder);
         });
+        return projectsInWorkspace;
     }
 }
diff --git a/src/razor/razor.ts b/src/razor/razor.ts
index 862e7d16b..43df5df31 100644
--- a/src/razor/razor.ts
+++ b/src/razor/razor.ts
@@ -9,11 +9,14 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as Razor from '../../src/razor/src/extension';
 import { EventStream } from '../eventStream';
+import { PlatformInformation } from '../shared/platform';
 
 export async function activateRazorExtension(
     context: vscode.ExtensionContext,
     extensionPath: string,
     eventStream: EventStream,
+    csharpDevkitExtension: vscode.Extension<any> | undefined,
+    platformInfo: PlatformInformation,
     useOmnisharpServer: boolean
 ) {
     const razorConfig = vscode.workspace.getConfiguration('razor');
@@ -35,7 +38,15 @@ export async function activateRazorExtension(
                 /* enableProposedApis: */ false
             );
         } else {
-            await Razor.activate(vscode, context, languageServerDir, eventStream, /* enableProposedApis: */ false);
+            await Razor.activate(
+                vscode,
+                context,
+                languageServerDir,
+                eventStream,
+                csharpDevkitExtension,
+                platformInfo,
+                /* enableProposedApis: */ false
+            );
         }
     } else {
         vscode.window.showWarningMessage(
diff --git a/src/razor/razorTelemetryDownloader.ts b/src/razor/razorTelemetryDownloader.ts
new file mode 100644
index 000000000..c3ad95e7c
--- /dev/null
+++ b/src/razor/razorTelemetryDownloader.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { PlatformInformation } from '../shared/platform';
+import { PackageInstallation, LogPlatformInfo, InstallationSuccess } from '../omnisharp/loggingEvents';
+import { EventStream } from '../eventStream';
+import { NetworkSettingsProvider } from '../networkSettings';
+import { downloadAndInstallPackages } from '../packageManager/downloadAndInstallPackages';
+import { getRuntimeDependenciesPackages } from '../tools/runtimeDependencyPackageUtils';
+import { getAbsolutePathPackagesToInstall } from '../packageManager/getAbsolutePathPackagesToInstall';
+import { isValidDownload } from '../packageManager/isValidDownload';
+
+export class RazorTelemetryDownloader {
+    public constructor(
+        private networkSettingsProvider: NetworkSettingsProvider,
+        private eventStream: EventStream,
+        private packageJSON: any,
+        private platformInfo: PlatformInformation,
+        private extensionPath: string
+    ) {}
+
+    public async DownloadAndInstallRazorTelemetry(version: string): Promise<boolean> {
+        const runtimeDependencies = getRuntimeDependenciesPackages(this.packageJSON);
+        const razorPackages = runtimeDependencies.filter((inputPackage) => inputPackage.id === 'RazorTelemetry');
+        const packagesToInstall = await getAbsolutePathPackagesToInstall(
+            razorPackages,
+            this.platformInfo,
+            this.extensionPath
+        );
+
+        if (packagesToInstall.length > 0) {
+            this.eventStream.post(new PackageInstallation(`Razor Telemetry Version = ${version}`));
+            this.eventStream.post(new LogPlatformInfo(this.platformInfo));
+            if (
+                await downloadAndInstallPackages(
+                    packagesToInstall,
+                    this.networkSettingsProvider,
+                    this.eventStream,
+                    isValidDownload
+                )
+            ) {
+                this.eventStream.post(new InstallationSuccess());
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts b/src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts
index 4afa69663..9530e493b 100644
--- a/src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts
+++ b/src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import execa = require('execa');
 import { promises, readFileSync } from 'fs';
 import { join } from 'path';
 import { fileURLToPath } from 'url';
 import * as vscode from 'vscode';
-import { ChromeBrowserFinder, EdgeBrowserFinder } from 'vscode-js-debug-browsers';
+import { ChromeBrowserFinder, EdgeBrowserFinder } from '@vscode/js-debug-browsers';
 import { RazorLogger } from '../razorLogger';
 import { JS_DEBUG_NAME, SERVER_APP_NAME } from './constants';
 import { onDidTerminateDebugSession } from './terminateDebugHandler';
@@ -180,28 +181,33 @@ export class BlazorDebugConfigurationProvider implements vscode.DebugConfigurati
 
     public static async determineBrowserType(): Promise<string | undefined> {
         // There was no browser specified by the user, so we will do some auto-detection to find a browser,
-        // favoring chrome if multiple valid options are installed.
-        const chromeBrowserFinder = new ChromeBrowserFinder(process.env, promises, null);
-        const chromeInstallations = await chromeBrowserFinder.findAll();
-        if (chromeInstallations.length > 0) {
+        // favoring Edge if multiple valid options are installed.
+        const edgeBrowserFinder = new EdgeBrowserFinder(process.env, promises, execa);
+        const edgeInstallations = await edgeBrowserFinder.findAll();
+        if (edgeInstallations.length > 0) {
             showInformationMessage(
                 vscode,
-                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Chrome'`)
+                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Edge'`)
             );
-            return BlazorDebugConfigurationProvider.chromeBrowserType;
+
+            return BlazorDebugConfigurationProvider.edgeBrowserType;
         }
 
-        const edgeBrowserFinder = new EdgeBrowserFinder(process.env, promises, null);
-        const edgeInstallations = await edgeBrowserFinder.findAll();
-        if (edgeInstallations.length > 0) {
+        const chromeBrowserFinder = new ChromeBrowserFinder(process.env, promises, execa);
+        const chromeInstallations = await chromeBrowserFinder.findAll();
+        if (chromeInstallations.length > 0) {
             showInformationMessage(
                 vscode,
-                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Edge'`)
+                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Chrome'`)
             );
-            return BlazorDebugConfigurationProvider.edgeBrowserType;
+
+            return BlazorDebugConfigurationProvider.chromeBrowserType;
         }
 
-        showErrorMessage(vscode, vscode.l10n.t('Run and Debug: A valid browser is not installed'));
+        showErrorMessage(
+            vscode,
+            vscode.l10n.t('Run and Debug: A valid browser is not installed. Please install Edge or Chrome.')
+        );
         return undefined;
     }
 }
diff --git a/src/razor/src/codeActions/codeActionsHandler.ts b/src/razor/src/codeActions/codeActionsHandler.ts
index abd382827..017f1f611 100644
--- a/src/razor/src/codeActions/codeActionsHandler.ts
+++ b/src/razor/src/codeActions/codeActionsHandler.ts
@@ -9,11 +9,11 @@ import { RazorDocumentManager } from '../document/razorDocumentManager';
 import { RazorLanguageServerClient } from '../razorLanguageServerClient';
 import { RazorLogger } from '../razorLogger';
 import { SerializableDelegatedCodeActionParams } from './serializableDelegatedCodeActionParams';
-import { RoslynLanguageServer } from '../../../lsptoolshost/roslynLanguageServer';
 import { LanguageKind } from '../rpc/languageKind';
 import { UriConverter } from '../../../lsptoolshost/uriConverter';
 import { SerializableRazorResolveCodeActionParams } from './serializableRazorResolveCodeActionParams';
 import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
+import { provideCodeActionsCommand, resolveCodeActionCommand } from '../../../lsptoolshost/razorCommands';
 
 export class CodeActionsHandler {
     private static readonly provideCodeActionsEndpoint = 'razor/provideCodeActions';
@@ -84,9 +84,7 @@ export class CodeActionsHandler {
             const virtualCSharpUri = UriConverter.serialize(razorDocument.csharpDocument.uri);
             codeActionParams.textDocument = TextDocumentIdentifier.create(virtualCSharpUri);
 
-            return <CodeAction[]>(
-                await vscode.commands.executeCommand(RoslynLanguageServer.provideCodeActionsCommand, codeActionParams)
-            );
+            return <CodeAction[]>await vscode.commands.executeCommand(provideCodeActionsCommand, codeActionParams);
         } catch (error) {
             this.logger.logWarning(`${CodeActionsHandler.provideCodeActionsEndpoint} failed with ${error}`);
         }
@@ -124,9 +122,7 @@ export class CodeActionsHandler {
 
             // Call Roslyn. Since this code action came from Roslyn, we don't even have to point it
             // to the virtual C# document.
-            return <CodeAction>(
-                await vscode.commands.executeCommand(RoslynLanguageServer.resolveCodeActionCommand, codeAction)
-            );
+            return <CodeAction>await vscode.commands.executeCommand(resolveCodeActionCommand, codeAction);
         } catch (error) {
             this.logger.logWarning(`${CodeActionsHandler.resolveCodeActionsEndpoint} failed with ${error}`);
         }
diff --git a/src/razor/src/completion/provisionalCompletionOrchestrator.ts b/src/razor/src/completion/provisionalCompletionOrchestrator.ts
index 62d446ac3..28d171482 100644
--- a/src/razor/src/completion/provisionalCompletionOrchestrator.ts
+++ b/src/razor/src/completion/provisionalCompletionOrchestrator.ts
@@ -134,7 +134,8 @@ export class ProvisionalCompletionOrchestrator {
             htmlPosition,
             provisionalPosition,
             completionContext,
-            projection.languageKind
+            projection.languageKind,
+            newDocument
         );
 
         // We track when we add provisional dots to avoid doing unnecessary work on commonly invoked events.
diff --git a/src/razor/src/completion/razorCompletionItemProvider.ts b/src/razor/src/completion/razorCompletionItemProvider.ts
index a76aadd04..39a65dbf1 100644
--- a/src/razor/src/completion/razorCompletionItemProvider.ts
+++ b/src/razor/src/completion/razorCompletionItemProvider.ts
@@ -12,7 +12,6 @@ import { RazorLogger } from '../razorLogger';
 import { getUriPath } from '../uriPaths';
 import { ProvisionalCompletionOrchestrator } from './provisionalCompletionOrchestrator';
 import { LanguageKind } from '../rpc/languageKind';
-import { RoslynLanguageServer } from '../../../lsptoolshost/roslynLanguageServer';
 import {
     CompletionItem,
     CompletionList,
@@ -23,6 +22,7 @@ import {
 import { UriConverter } from '../../../lsptoolshost/uriConverter';
 import * as RazorConventions from '../razorConventions';
 import { MappingHelpers } from '../mapping/mappingHelpers';
+import { provideCompletionsCommand, resolveCompletionsCommand } from '../../../lsptoolshost/razorCommands';
 
 export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implements vscode.CompletionItemProvider {
     public static async getCompletions(
@@ -30,7 +30,8 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
         hostDocumentPosition: vscode.Position,
         projectedPosition: vscode.Position,
         context: vscode.CompletionContext,
-        language: LanguageKind
+        language: LanguageKind,
+        razorDocument: vscode.TextDocument
     ) {
         if (projectedUri) {
             // "@" is not a valid trigger character for C# / HTML and therefore we need to translate
@@ -59,7 +60,7 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
                 // that field because it doesn't exist in the declared vs code
                 // CompletionItem type.
                 completions = await vscode.commands.executeCommand<vscode.CompletionList | vscode.CompletionItem[]>(
-                    RoslynLanguageServer.provideCompletionsCommand,
+                    provideCompletionsCommand,
                     params
                 );
             } else {
@@ -86,6 +87,11 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
             // In the code behind it's represented as __o = DateTime.
             const completionCharacterOffset = projectedPosition.character - hostDocumentPosition.character;
             for (const completionItem of completionItems) {
+                // vscode.CompletionItemKind is off by one compared to the LSP CompletionItemKind.
+                if (completionItem.kind !== undefined) {
+                    completionItem.kind = completionItem.kind - 1;
+                }
+
                 const doc = completionItem.documentation as vscode.MarkdownString;
                 if (doc && doc.value) {
                     // Without this, the documentation doesn't get rendered in the editor.
@@ -166,6 +172,8 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
                 }
             }
 
+            this.addUsingKeyword(language, razorDocument, hostDocumentPosition, completionItems);
+
             const isIncomplete = completions instanceof Array ? false : completions ? completions.isIncomplete : false;
             return new vscode.CompletionList(completionItems, isIncomplete);
         }
@@ -221,7 +229,8 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
             position,
             projection.position,
             context,
-            projection.languageKind
+            projection.languageKind,
+            document
         );
 
         return completionList;
@@ -236,7 +245,7 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
         // equivalent vscode command to generically do that.
         if ((<CompletionItem>item).data) {
             const newItem = await vscode.commands.executeCommand<vscode.CompletionItem>(
-                RoslynLanguageServer.resolveCompletionsCommand,
+                resolveCompletionsCommand,
                 item
             );
 
@@ -278,6 +287,38 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
 
         return item;
     }
+
+    private static addUsingKeyword(
+        language: LanguageKind,
+        razorDocument: vscode.TextDocument,
+        hostDocumentPosition: vscode.Position,
+        completionItems: vscode.CompletionItem[]
+    ) {
+        // This is an ugly hack, but it's needed to get the "using" keyword to show up in the completion list.
+        // The reason it doesn't show up is because the C# generated document puts the position of the cursor
+        // at '__o = [||]', which isn't a valid location for a using statement.
+        if (language == LanguageKind.CSharp) {
+            const line = razorDocument.lineAt(hostDocumentPosition.line);
+            const lineText = line.text.substring(0, hostDocumentPosition.character);
+            if (
+                lineText.endsWith('@') ||
+                lineText.endsWith(
+                    '@u' ||
+                        lineText.endsWith('@us') ||
+                        lineText.endsWith('@usi') ||
+                        lineText.endsWith('@usin') ||
+                        lineText.endsWith('@using')
+                )
+            ) {
+                const usingItem = new vscode.CompletionItem('using', vscode.CompletionItemKind.Keyword);
+
+                // Matching Roslyn's documentation behavior
+                (<CompletionItem>usingItem).documentation = vscode.l10n.t('{0} Keyword', 'using');
+
+                completionItems.push(usingItem);
+            }
+        }
+    }
 }
 
 function getTriggerKind(triggerKind: vscode.CompletionTriggerKind): CompletionTriggerKind {
diff --git a/src/razor/src/csharp/csharpProjectedDocument.ts b/src/razor/src/csharp/csharpProjectedDocument.ts
index 5919e8687..3366d1590 100644
--- a/src/razor/src/csharp/csharpProjectedDocument.ts
+++ b/src/razor/src/csharp/csharpProjectedDocument.ts
@@ -29,6 +29,14 @@ export class CSharpProjectedDocument implements IProjectedDocument {
         return this.projectedDocumentVersion;
     }
 
+    public get length(): number {
+        return this.content.length;
+    }
+
+    public clear() {
+        this.setContent('');
+    }
+
     public update(edits: ServerTextChange[], hostDocumentVersion: number) {
         this.removeProvisionalDot();
 
diff --git a/src/razor/src/diagnostics/razorDiagnosticHandler.ts b/src/razor/src/diagnostics/razorDiagnosticHandler.ts
index 321348057..8c63228f4 100644
--- a/src/razor/src/diagnostics/razorDiagnosticHandler.ts
+++ b/src/razor/src/diagnostics/razorDiagnosticHandler.ts
@@ -6,13 +6,13 @@
 import * as vscode from 'vscode';
 import { DocumentDiagnosticReport, DocumentDiagnosticParams, RequestType } from 'vscode-languageclient';
 import { RazorLanguageServerClient } from '../razorLanguageServerClient';
-import { RoslynLanguageServer } from '../../../lsptoolshost/roslynLanguageServer';
 import { RazorDocumentManager } from '../document/razorDocumentManager';
 import { UriConverter } from '../../../lsptoolshost/uriConverter';
 import { RazorLanguageServiceClient } from '../razorLanguageServiceClient';
 import { RazorLanguageFeatureBase } from '../razorLanguageFeatureBase';
 import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
 import { RazorLogger } from '../razorLogger';
+import { roslynPullDiagnosticCommand } from '../../../lsptoolshost/razorCommands';
 
 export class RazorDiagnosticHandler extends RazorLanguageFeatureBase {
     private static readonly razorPullDiagnosticsCommand = 'razor/csharpPullDiagnostics';
@@ -52,7 +52,7 @@ export class RazorDiagnosticHandler extends RazorLanguageFeatureBase {
         const virtualCSharpUri = razorDocument.csharpDocument.uri;
         request.textDocument.uri = UriConverter.serialize(virtualCSharpUri);
         const response: DocumentDiagnosticReport = await vscode.commands.executeCommand(
-            RoslynLanguageServer.roslynPullDiagnosticCommand,
+            roslynPullDiagnosticCommand,
             request
         );
 
diff --git a/src/razor/src/document/razorDocumentManager.ts b/src/razor/src/document/razorDocumentManager.ts
index 411358873..656a6fb85 100644
--- a/src/razor/src/document/razorDocumentManager.ts
+++ b/src/razor/src/document/razorDocumentManager.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { RoslynLanguageServer } from '../../../lsptoolshost/roslynLanguageServer';
 import { CSharpProjectedDocument } from '../csharp/csharpProjectedDocument';
 import { HtmlProjectedDocument } from '../html/htmlProjectedDocument';
 import { RazorLanguage } from '../razorLanguage';
 import { RazorLanguageServerClient } from '../razorLanguageServerClient';
 import { RazorLogger } from '../razorLogger';
+import { TelemetryReporter } from '../telemetryReporter';
 import { UpdateBufferRequest } from '../rpc/updateBufferRequest';
 import { getUriPath } from '../uriPaths';
 import { IRazorDocument } from './IRazorDocument';
@@ -17,6 +17,7 @@ import { IRazorDocumentChangeEvent } from './IRazorDocumentChangeEvent';
 import { IRazorDocumentManager } from './IRazorDocumentManager';
 import { RazorDocumentChangeKind } from './razorDocumentChangeKind';
 import { createDocument } from './razorDocumentFactory';
+import { razorInitializeCommand } from '../../../lsptoolshost/razorCommands';
 
 export class RazorDocumentManager implements IRazorDocumentManager {
     public roslynActivated = false;
@@ -27,9 +28,12 @@ export class RazorDocumentManager implements IRazorDocumentManager {
     private readonly onRazorInitializedEmitter = new vscode.EventEmitter<void>();
 
     public razorDocumentGenerationInitialized = false;
-    private anyRazorDocumentOpen = false;
 
-    constructor(private readonly serverClient: RazorLanguageServerClient, private readonly logger: RazorLogger) {}
+    constructor(
+        private readonly serverClient: RazorLanguageServerClient,
+        private readonly logger: RazorLogger,
+        private readonly telemetryReporter: TelemetryReporter
+    ) {}
 
     public get onChange() {
         return this.onChangeEmitter.event;
@@ -156,7 +160,6 @@ export class RazorDocumentManager implements IRazorDocumentManager {
     }
 
     private async openDocument(uri: vscode.Uri) {
-        this.anyRazorDocumentOpen = true;
         await this.ensureRazorInitialized();
 
         const document = this._getDocument(uri);
@@ -165,14 +168,13 @@ export class RazorDocumentManager implements IRazorDocumentManager {
     }
 
     public async ensureRazorInitialized() {
-        // On first open of a Razor document, we kick off the generation of all razor documents so that
-        // components are discovered correctly. If we do this early, when we initialize everything, we
-        // just spend a lot of time generating documents and json files that might not be needed.
-        // If we wait for each individual document to be opened by the user, then locally defined components
-        // don't work, which is a poor experience. This is the compromise.
-        if (this.roslynActivated && !this.razorDocumentGenerationInitialized && this.anyRazorDocumentOpen) {
+        // Kick off the generation of all Razor documents so that components are
+        // discovered correctly. We need to do this even if a Razor file isn't
+        // open yet to handle the scenario where the user opens a C# file before
+        // a Razor file.
+        if (this.roslynActivated && !this.razorDocumentGenerationInitialized) {
             this.razorDocumentGenerationInitialized = true;
-            vscode.commands.executeCommand(RoslynLanguageServer.razorInitializeCommand);
+            vscode.commands.executeCommand(razorInitializeCommand);
             for (const document of this.documents) {
                 await this.ensureDocumentAndProjectedDocumentsOpen(document);
             }
@@ -230,6 +232,7 @@ export class RazorDocumentManager implements IRazorDocumentManager {
         const projectedDocument = document.csharpDocument;
 
         if (
+            updateBufferRequest.previousWasEmpty ||
             !projectedDocument.hostDocumentSyncVersion ||
             projectedDocument.hostDocumentSyncVersion <= updateBufferRequest.hostDocumentVersion
         ) {
@@ -240,6 +243,15 @@ export class RazorDocumentManager implements IRazorDocumentManager {
             await vscode.workspace.openTextDocument(document.csharpDocument.uri);
 
             const csharpProjectedDocument = projectedDocument as CSharpProjectedDocument;
+
+            // If the language server is telling us that the previous document was empty, then we should clear
+            // ours out. Hopefully ours would have been empty too, but there are cases where things get out of
+            // sync
+            if (updateBufferRequest.previousWasEmpty && projectedDocument.length !== 0) {
+                this.telemetryReporter.reportBuffersOutOfSync();
+                csharpProjectedDocument.clear();
+            }
+
             csharpProjectedDocument.update(updateBufferRequest.changes, updateBufferRequest.hostDocumentVersion);
 
             this.notifyDocumentChange(document, RazorDocumentChangeKind.csharpChanged);
@@ -263,6 +275,7 @@ export class RazorDocumentManager implements IRazorDocumentManager {
         const projectedDocument = document.htmlDocument;
 
         if (
+            updateBufferRequest.previousWasEmpty ||
             !projectedDocument.hostDocumentSyncVersion ||
             projectedDocument.hostDocumentSyncVersion <= updateBufferRequest.hostDocumentVersion
         ) {
@@ -273,6 +286,15 @@ export class RazorDocumentManager implements IRazorDocumentManager {
             await vscode.workspace.openTextDocument(document.htmlDocument.uri);
 
             const htmlProjectedDocument = projectedDocument as HtmlProjectedDocument;
+
+            // If the language server is telling us that the previous document was empty, then we should clear
+            // ours out. Hopefully ours would have been empty too, but there are cases where things get out of
+            // sync
+            if (updateBufferRequest.previousWasEmpty && projectedDocument.length !== 0) {
+                this.telemetryReporter.reportBuffersOutOfSync();
+                htmlProjectedDocument.clear();
+            }
+
             htmlProjectedDocument.update(updateBufferRequest.changes, updateBufferRequest.hostDocumentVersion);
 
             this.notifyDocumentChange(document, RazorDocumentChangeKind.htmlChanged);
diff --git a/src/razor/src/extension.ts b/src/razor/src/extension.ts
index 2ef7ef004..30e3e21b3 100644
--- a/src/razor/src/extension.ts
+++ b/src/razor/src/extension.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as path from 'path';
 import * as vscode from 'vscode';
 import * as vscodeapi from 'vscode';
 import { ExtensionContext } from 'vscode';
@@ -41,9 +42,15 @@ import { RazorReferenceProvider } from './reference/razorReferenceProvider';
 import { RazorRenameProvider } from './rename/razorRenameProvider';
 import { SemanticTokensRangeHandler } from './semantic/semanticTokensRangeHandler';
 import { RazorSignatureHelpProvider } from './signatureHelp/razorSignatureHelpProvider';
-import { TelemetryReporter } from './telemetryReporter';
+import { TelemetryReporter as RazorTelemetryReporter } from './telemetryReporter';
 import { RazorDiagnosticHandler } from './diagnostics/razorDiagnosticHandler';
 import { RazorSimplifyMethodHandler } from './simplify/razorSimplifyMethodHandler';
+import { CSharpDevKitExports } from '../../csharpDevKitExports';
+import { DotnetRuntimeExtensionResolver } from '../../lsptoolshost/dotnetRuntimeExtensionResolver';
+import { PlatformInformation } from '../../shared/platform';
+import { RazorLanguageServerOptions } from './razorLanguageServerOptions';
+import { resolveRazorLanguageServerOptions } from './razorLanguageServerOptionsResolver';
+import { RazorFormatNewFileHandler } from './formatNewFile/razorFormatNewFileHandler';
 
 // We specifically need to take a reference to a particular instance of the vscode namespace,
 // otherwise providers attempt to operate on the null extension.
@@ -52,28 +59,64 @@ export async function activate(
     context: ExtensionContext,
     languageServerDir: string,
     eventStream: HostEventStream,
+    csharpDevkitExtension: vscode.Extension<CSharpDevKitExports> | undefined,
+    platformInfo: PlatformInformation,
     enableProposedApis = false
 ) {
-    const telemetryReporter = new TelemetryReporter(eventStream);
+    const razorTelemetryReporter = new RazorTelemetryReporter(eventStream);
     const eventEmitterFactory: IEventEmitterFactory = {
         create: <T>() => new vscode.EventEmitter<T>(),
     };
 
     const languageServerTrace = resolveRazorLanguageServerTrace(vscodeType);
-    const logger = new RazorLogger(vscodeType, eventEmitterFactory, languageServerTrace);
+    const logger = new RazorLogger(eventEmitterFactory, languageServerTrace);
 
     try {
+        const razorOptions: RazorLanguageServerOptions = resolveRazorLanguageServerOptions(
+            vscodeType,
+            languageServerDir,
+            languageServerTrace,
+            logger
+        );
+
+        const hostExecutableResolver = new DotnetRuntimeExtensionResolver(
+            platformInfo,
+            () => razorOptions.serverPath,
+            logger.outputChannel,
+            context.extensionPath
+        );
+
+        const dotnetInfo = await hostExecutableResolver.getHostExecutableInfo();
+        const dotnetRuntimePath = path.dirname(dotnetInfo.path);
+
+        // Take care to always run .NET processes on the runtime that we intend.
+        // The dotnet.exe we point to should not go looking for other runtimes.
+        const env: NodeJS.ProcessEnv = { ...process.env };
+        env.DOTNET_ROOT = dotnetRuntimePath;
+        env.DOTNET_MULTILEVEL_LOOKUP = '0';
+        // Save user's DOTNET_ROOT env-var value so server can recover the user setting when needed
+        env.DOTNET_ROOT_USER = process.env.DOTNET_ROOT ?? 'EMPTY';
+
+        // Set up DevKit environment for telemetry
+        if (csharpDevkitExtension) {
+            await setupDevKitEnvironment(env, csharpDevkitExtension, logger);
+        }
+
         const languageServerClient = new RazorLanguageServerClient(
             vscodeType,
             languageServerDir,
-            telemetryReporter,
+            razorTelemetryReporter,
+            csharpDevkitExtension !== undefined,
+            env,
+            dotnetInfo.path,
             logger
         );
+
         const languageServiceClient = new RazorLanguageServiceClient(languageServerClient);
 
-        const documentManager = new RazorDocumentManager(languageServerClient, logger);
+        const documentManager = new RazorDocumentManager(languageServerClient, logger, razorTelemetryReporter);
         const documentSynchronizer = new RazorDocumentSynchronizer(documentManager, logger);
-        reportTelemetryForDocuments(documentManager, telemetryReporter);
+        reportTelemetryForDocuments(documentManager, razorTelemetryReporter);
         const languageConfiguration = new RazorLanguageConfiguration();
         const csharpFeature = new RazorCSharpFeature(documentManager, eventEmitterFactory, logger);
         const htmlFeature = new RazorHtmlFeature(documentManager, languageServiceClient, eventEmitterFactory, logger);
@@ -99,7 +142,12 @@ export async function activate(
                 languageServiceClient,
                 logger
             );
-            const semanticTokenHandler = new SemanticTokensRangeHandler(languageServerClient);
+            const semanticTokenHandler = new SemanticTokensRangeHandler(
+                documentManager,
+                documentSynchronizer,
+                languageServerClient,
+                logger
+            );
             const colorPresentationHandler = new ColorPresentationHandler(
                 documentManager,
                 languageServerClient,
@@ -188,6 +236,13 @@ export async function activate(
                 documentManager,
                 logger
             );
+            const razorFormatNewFileHandler = new RazorFormatNewFileHandler(
+                documentSynchronizer,
+                languageServerClient,
+                languageServiceClient,
+                documentManager,
+                logger
+            );
 
             localRegistrations.push(
                 languageConfiguration.register(),
@@ -232,6 +287,7 @@ export async function activate(
                 razorDiagnosticHandler.register(),
                 codeActionsHandler.register(),
                 razorSimplifyMethodHandler.register(),
+                razorFormatNewFileHandler.register(),
             ]);
         });
 
@@ -252,7 +308,7 @@ export async function activate(
         context.subscriptions.push(languageServerClient, onStopRegistration, logger);
     } catch (error) {
         logger.logError('Failed when activating Razor VSCode.', error as Error);
-        telemetryReporter.reportErrorOnActivation(error as Error);
+        razorTelemetryReporter.reportErrorOnActivation(error as Error);
     }
 }
 
@@ -284,3 +340,23 @@ async function startLanguageServer(
         await languageServerClient.start();
     }
 }
+
+async function setupDevKitEnvironment(
+    env: NodeJS.ProcessEnv,
+    csharpDevkitExtension: vscode.Extension<CSharpDevKitExports>,
+    logger: RazorLogger
+): Promise<void> {
+    try {
+        const exports = await csharpDevkitExtension.activate();
+
+        // setupTelemetryEnvironmentAsync was a later addition to devkit (not in preview 1)
+        // so it may not exist in whatever version of devkit the user has installed
+        if (!exports.setupTelemetryEnvironmentAsync) {
+            return;
+        }
+
+        await exports.setupTelemetryEnvironmentAsync(env);
+    } catch (error) {
+        logger.logError('Failed to setup DevKit environment for telemetry.', error as Error);
+    }
+}
diff --git a/src/razor/src/formatNewFile/razorFormatNewFileHandler.ts b/src/razor/src/formatNewFile/razorFormatNewFileHandler.ts
new file mode 100644
index 000000000..998cd618d
--- /dev/null
+++ b/src/razor/src/formatNewFile/razorFormatNewFileHandler.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { RequestType } from 'vscode-languageclient';
+import { RazorLanguageServerClient } from '../razorLanguageServerClient';
+import { RazorDocumentManager } from '../document/razorDocumentManager';
+import { RazorLanguageServiceClient } from '../razorLanguageServiceClient';
+import { RazorLanguageFeatureBase } from '../razorLanguageFeatureBase';
+import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
+import { RazorLogger } from '../razorLogger';
+import { SerializableFormatNewFileParams } from './serializableFormatNewFileParams';
+import { roslynFormatNewFileCommand } from '../../../lsptoolshost/razorCommands';
+
+export class RazorFormatNewFileHandler extends RazorLanguageFeatureBase {
+    private static readonly razorFormatNewFileCommand = 'razor/formatNewFile';
+    private formatNewFileRequestType: RequestType<SerializableFormatNewFileParams, string | undefined, any> =
+        new RequestType(RazorFormatNewFileHandler.razorFormatNewFileCommand);
+
+    constructor(
+        documentSynchronizer: RazorDocumentSynchronizer,
+        protected readonly serverClient: RazorLanguageServerClient,
+        protected readonly serviceClient: RazorLanguageServiceClient,
+        protected readonly documentManager: RazorDocumentManager,
+        protected readonly logger: RazorLogger
+    ) {
+        super(documentSynchronizer, documentManager, serviceClient, logger);
+    }
+
+    public async register() {
+        await this.serverClient.onRequestWithParams<SerializableFormatNewFileParams, string | undefined, any>(
+            this.formatNewFileRequestType,
+            async (request: SerializableFormatNewFileParams, token: vscode.CancellationToken) =>
+                this.getFormatNewFile(request, token)
+        );
+    }
+
+    private async getFormatNewFile(
+        request: SerializableFormatNewFileParams,
+        _: vscode.CancellationToken
+    ): Promise<string | undefined> {
+        if (!this.documentManager.roslynActivated) {
+            return undefined;
+        }
+
+        const response: string | undefined = await vscode.commands.executeCommand(roslynFormatNewFileCommand, request);
+
+        return response;
+    }
+}
diff --git a/src/razor/src/formatNewFile/serializableFormatNewFileParams.ts b/src/razor/src/formatNewFile/serializableFormatNewFileParams.ts
new file mode 100644
index 000000000..26227a24f
--- /dev/null
+++ b/src/razor/src/formatNewFile/serializableFormatNewFileParams.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { SerializableTextDocumentIdentifier } from '../rpc/serializableTextDocumentIdentifier';
+
+export interface SerializableFormatNewFileParams {
+    project: SerializableTextDocumentIdentifier;
+    document: SerializableTextDocumentIdentifier;
+    contents: string;
+}
diff --git a/src/razor/src/html/htmlProjectedDocument.ts b/src/razor/src/html/htmlProjectedDocument.ts
index 49abe831e..b8c2fc530 100644
--- a/src/razor/src/html/htmlProjectedDocument.ts
+++ b/src/razor/src/html/htmlProjectedDocument.ts
@@ -26,6 +26,14 @@ export class HtmlProjectedDocument implements IProjectedDocument {
         return this.projectedDocumentVersion;
     }
 
+    public get length(): number {
+        return this.content.length;
+    }
+
+    public clear() {
+        this.setContent('');
+    }
+
     public update(edits: ServerTextChange[], hostDocumentVersion: number) {
         this.hostDocumentVersion = hostDocumentVersion;
 
diff --git a/src/razor/src/projection/IProjectedDocument.ts b/src/razor/src/projection/IProjectedDocument.ts
index 4b9270900..d4c8df1c8 100644
--- a/src/razor/src/projection/IProjectedDocument.ts
+++ b/src/razor/src/projection/IProjectedDocument.ts
@@ -10,5 +10,6 @@ export interface IProjectedDocument {
     readonly uri: vscode.Uri;
     readonly hostDocumentSyncVersion: number | null;
     readonly projectedDocumentSyncVersion: number;
+    readonly length: number;
     getContent(): string;
 }
diff --git a/src/razor/src/razorLanguageServerClient.ts b/src/razor/src/razorLanguageServerClient.ts
index f3acb5d89..b760a3e5b 100644
--- a/src/razor/src/razorLanguageServerClient.ts
+++ b/src/razor/src/razorLanguageServerClient.ts
@@ -3,7 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as path from 'path';
+import * as cp from 'child_process';
 import { EventEmitter } from 'events';
+import * as util from '../../common';
 import * as vscode from 'vscode';
 import { RequestHandler, RequestType } from 'vscode-jsonrpc';
 import { GenericNotificationHandler, InitializeResult, LanguageClientOptions, State } from 'vscode-languageclient';
@@ -13,7 +16,8 @@ import { RazorLanguageServerOptions } from './razorLanguageServerOptions';
 import { resolveRazorLanguageServerOptions } from './razorLanguageServerOptionsResolver';
 import { resolveRazorLanguageServerTrace } from './razorLanguageServerTraceResolver';
 import { RazorLogger } from './razorLogger';
-import { TelemetryReporter } from './telemetryReporter';
+import { TelemetryReporter as RazorTelemetryReporter } from './telemetryReporter';
+import { randomUUID } from 'crypto';
 
 const events = {
     ServerStop: 'ServerStop',
@@ -33,7 +37,10 @@ export class RazorLanguageServerClient implements vscode.Disposable {
     constructor(
         private readonly vscodeType: typeof vscode,
         private readonly languageServerDir: string,
-        private readonly telemetryReporter: TelemetryReporter,
+        private readonly razorTelemetryReporter: RazorTelemetryReporter,
+        private readonly isCSharpDevKitActivated: boolean,
+        private readonly env: NodeJS.ProcessEnv,
+        private readonly dotnetExecutablePath: string,
         private readonly logger: RazorLogger
     ) {
         this.isStarted = false;
@@ -128,7 +135,7 @@ export class RazorLanguageServerClient implements vscode.Disposable {
                 )
             );
 
-            this.telemetryReporter.reportErrorOnServerStart(error as Error);
+            this.razorTelemetryReporter.reportErrorOnServerStart(error as Error);
             reject(error);
         }
 
@@ -211,32 +218,21 @@ export class RazorLanguageServerClient implements vscode.Disposable {
             languageServerTrace,
             this.logger
         );
-
         this.clientOptions = {
             outputChannel: options.outputChannel,
             documentSelector: [{ language: RazorLanguage.id, pattern: RazorLanguage.globbingPattern }],
         };
 
         const args: string[] = [];
-        let command = options.serverPath;
-        if (options.serverPath.endsWith('.dll')) {
-            this.logger.logMessage(
-                'Razor Language Server path is an assembly. ' +
-                    "Using 'dotnet' from the current path to start the server."
-            );
-
-            command = 'dotnet';
-            args.push(options.serverPath);
-        }
 
         this.logger.logMessage(`Razor language server path: ${options.serverPath}`);
 
         args.push('--trace');
         args.push(options.trace.toString());
-        this.telemetryReporter.reportTraceLevel(options.trace);
+        this.razorTelemetryReporter.reportTraceLevel(options.trace);
 
         if (options.debug) {
-            this.telemetryReporter.reportDebugLanguageServer();
+            this.razorTelemetryReporter.reportDebugLanguageServer();
 
             this.logger.logMessage('Debug flag set for Razor Language Server.');
             args.push('--debug');
@@ -245,16 +241,43 @@ export class RazorLanguageServerClient implements vscode.Disposable {
         // TODO: When all of this code is on GitHub, should we just pass `--omnisharp` as a flag to rzls, and let it decide?
         if (!options.usingOmniSharp) {
             args.push('--projectConfigurationFileName');
-            args.push('project.razor.vscode.json');
+            args.push('project.razor.vscode.bin');
             args.push('--DelegateToCSharpOnDiagnosticPublish');
             args.push('true');
-            args.push('--SupportsDelegatedCodeActions');
-            args.push('true');
             args.push('--UpdateBuffersForClosedDocuments');
             args.push('true');
+
+            if (this.isCSharpDevKitActivated) {
+                args.push('--sessionId', getSessionId());
+                args.push(
+                    '--telemetryExtensionPath',
+                    path.join(util.getExtensionPath(), '.razortelemetry', 'Microsoft.VisualStudio.DevKit.Razor.dll')
+                );
+            }
         }
 
-        this.serverOptions = { command, args };
+        let childProcess: () => Promise<cp.ChildProcessWithoutNullStreams>;
+        const cpOptions: cp.SpawnOptionsWithoutStdio = {
+            detached: true,
+            windowsHide: true,
+            env: this.env,
+        };
+
+        if (options.serverPath.endsWith('.dll')) {
+            // If we were given a path to a dll, launch that via dotnet.
+            const argsWithPath = [options.serverPath].concat(args);
+            this.logger.logMessage(`Server arguments ${argsWithPath.join(' ')}`);
+
+            childProcess = async () => cp.spawn(this.dotnetExecutablePath, argsWithPath, cpOptions);
+        } else {
+            // Otherwise assume we were given a path to an executable.
+            this.logger.logMessage(`Server arguments ${args.join(' ')}`);
+
+            childProcess = async () => cp.spawn(options.serverPath, args, cpOptions);
+        }
+
+        this.serverOptions = childProcess;
+
         this.client = new LanguageClient(
             'razorLanguageServer',
             'Razor Language Server',
@@ -263,3 +286,16 @@ export class RazorLanguageServerClient implements vscode.Disposable {
         );
     }
 }
+
+// VS code will have a default session id when running under tests. Since we may still
+// report telemetry, we need to give a unique session id instead of the default value.
+function getSessionId(): string {
+    const sessionId = vscode.env.sessionId;
+
+    // 'somevalue.sessionid' is the test session id provided by vs code
+    if (sessionId.toLowerCase() === 'somevalue.sessionid') {
+        return randomUUID();
+    }
+
+    return sessionId;
+}
diff --git a/src/razor/src/razorLogger.ts b/src/razor/src/razorLogger.ts
index 8a2e5625a..970626783 100644
--- a/src/razor/src/razorLogger.ts
+++ b/src/razor/src/razorLogger.ts
@@ -15,21 +15,17 @@ export class RazorLogger implements vscodeAdapter.Disposable {
     public static readonly verbositySetting = 'razor.trace';
     public verboseEnabled!: boolean;
     public messageEnabled!: boolean;
-    public readonly outputChannel: vscodeAdapter.OutputChannel;
+    public readonly outputChannel: vscode.OutputChannel;
 
     private readonly onLogEmitter: vscodeAdapter.EventEmitter<string>;
     private readonly onTraceLevelChangeEmitter: vscodeAdapter.EventEmitter<Trace>;
 
-    constructor(
-        private readonly vscodeApi: vscodeAdapter.api,
-        eventEmitterFactory: IEventEmitterFactory,
-        public trace: Trace
-    ) {
+    constructor(eventEmitterFactory: IEventEmitterFactory, public trace: Trace) {
         this.processTraceLevel();
         this.onLogEmitter = eventEmitterFactory.create<string>();
         this.onTraceLevelChangeEmitter = eventEmitterFactory.create<Trace>();
 
-        this.outputChannel = this.vscodeApi.window.createOutputChannel(RazorLogger.logName);
+        this.outputChannel = vscode.window.createOutputChannel(RazorLogger.logName);
 
         this.logRazorInformation();
         this.setupToStringOverrides();
diff --git a/src/razor/src/rpc/updateBufferRequest.ts b/src/razor/src/rpc/updateBufferRequest.ts
index f5746d846..619886720 100644
--- a/src/razor/src/rpc/updateBufferRequest.ts
+++ b/src/razor/src/rpc/updateBufferRequest.ts
@@ -9,6 +9,7 @@ export class UpdateBufferRequest {
     constructor(
         public readonly hostDocumentVersion: number,
         public readonly hostDocumentFilePath: string,
-        public readonly changes: ServerTextChange[]
+        public readonly changes: ServerTextChange[],
+        public readonly previousWasEmpty: boolean
     ) {}
 }
diff --git a/src/razor/src/semantic/provideSemanticTokensResponse.ts b/src/razor/src/semantic/provideSemanticTokensResponse.ts
index 210cd0b41..ce787867d 100644
--- a/src/razor/src/semantic/provideSemanticTokensResponse.ts
+++ b/src/razor/src/semantic/provideSemanticTokensResponse.ts
@@ -3,9 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SemanticTokensResponse } from './semanticTokensResponse';
-
 export class ProvideSemanticTokensResponse {
     // tslint:disable-next-line: variable-name
-    constructor(public Result: SemanticTokensResponse, public HostDocumentSyncVersion: number | null) {}
+    constructor(public Tokens: number[], public HostDocumentSyncVersion: number) {}
 }
diff --git a/src/razor/src/semantic/semanticTokensRangeHandler.ts b/src/razor/src/semantic/semanticTokensRangeHandler.ts
index fa1d469a6..cbf8c76c6 100644
--- a/src/razor/src/semantic/semanticTokensRangeHandler.ts
+++ b/src/razor/src/semantic/semanticTokensRangeHandler.ts
@@ -7,8 +7,10 @@ import * as vscode from 'vscode';
 import { RequestType } from 'vscode-languageclient';
 import { RazorLanguageServerClient } from '../razorLanguageServerClient';
 import { ProvideSemanticTokensResponse } from './provideSemanticTokensResponse';
-import { SemanticTokensResponse } from './semanticTokensResponse';
 import { SerializableSemanticTokensParams } from './serializableSemanticTokensParams';
+import { RazorDocumentManager } from '../document/razorDocumentManager';
+import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
+import { RazorLogger } from '../razorLogger';
 
 export class SemanticTokensRangeHandler {
     private static readonly getSemanticTokensRangeEndpoint = 'razor/provideSemanticTokensRange';
@@ -17,12 +19,14 @@ export class SemanticTokensRangeHandler {
         ProvideSemanticTokensResponse,
         any
     > = new RequestType(SemanticTokensRangeHandler.getSemanticTokensRangeEndpoint);
-    private emptySemanticTokensResponse: ProvideSemanticTokensResponse = new ProvideSemanticTokensResponse(
-        new SemanticTokensResponse(new Array<number>(), ''),
-        null
-    );
+    private emptyTokensResponse: number[] = new Array<number>();
 
-    constructor(private readonly serverClient: RazorLanguageServerClient) {}
+    constructor(
+        private readonly documentManager: RazorDocumentManager,
+        private readonly documentSynchronizer: RazorDocumentSynchronizer,
+        private readonly serverClient: RazorLanguageServerClient,
+        private readonly logger: RazorLogger
+    ) {}
 
     public async register() {
         await this.serverClient.onRequestWithParams<
@@ -37,13 +41,55 @@ export class SemanticTokensRangeHandler {
     }
 
     private async getSemanticTokens(
-        _semanticTokensParams: SerializableSemanticTokensParams,
-        _cancellationToken: vscode.CancellationToken
+        semanticTokensParams: SerializableSemanticTokensParams,
+        cancellationToken: vscode.CancellationToken
     ): Promise<ProvideSemanticTokensResponse> {
-        // This is currently a no-op since (1) the default C# semantic tokens experience is already powerful and
-        // (2) there seems to be an issue with the semantic tokens execute command - possibly either O# not
-        // returning tokens, or an issue with the command itself:
-        // https://github.com/dotnet/razor/issues/6922
-        return this.emptySemanticTokensResponse;
+        try {
+            const razorDocumentUri = vscode.Uri.parse(semanticTokensParams.textDocument.uri, true);
+            const razorDocument = await this.documentManager.getDocument(razorDocumentUri);
+            if (razorDocument === undefined) {
+                this.logger.logWarning(
+                    `Could not find Razor document ${razorDocumentUri}; returning semantic tokens information.`
+                );
+
+                return new ProvideSemanticTokensResponse(
+                    this.emptyTokensResponse,
+                    semanticTokensParams.requiredHostDocumentVersion
+                );
+            }
+
+            const textDocument = await vscode.workspace.openTextDocument(razorDocumentUri);
+            const synchronized = await this.documentSynchronizer.trySynchronizeProjectedDocument(
+                textDocument,
+                razorDocument.csharpDocument,
+                semanticTokensParams.requiredHostDocumentVersion,
+                cancellationToken
+            );
+
+            if (!synchronized) {
+                return new ProvideSemanticTokensResponse(
+                    this.emptyTokensResponse,
+                    semanticTokensParams.requiredHostDocumentVersion
+                );
+            }
+
+            const tokens = await vscode.commands.executeCommand<vscode.SemanticTokens>(
+                'vscode.provideDocumentRangeSemanticTokens',
+                razorDocument.csharpDocument.uri,
+                semanticTokensParams.ranges[0]
+            );
+
+            return new ProvideSemanticTokensResponse(
+                Array.from(tokens.data),
+                semanticTokensParams.requiredHostDocumentVersion
+            );
+        } catch (error) {
+            this.logger.logWarning(`${SemanticTokensRangeHandler.getSemanticTokensRangeEndpoint} failed with ${error}`);
+        }
+
+        return new ProvideSemanticTokensResponse(
+            this.emptyTokensResponse,
+            semanticTokensParams.requiredHostDocumentVersion
+        );
     }
 }
diff --git a/src/razor/src/semantic/serializableSemanticTokensParams.ts b/src/razor/src/semantic/serializableSemanticTokensParams.ts
index 618dc6d3e..044027b5c 100644
--- a/src/razor/src/semantic/serializableSemanticTokensParams.ts
+++ b/src/razor/src/semantic/serializableSemanticTokensParams.ts
@@ -7,6 +7,8 @@ import { SerializableRange } from '../rpc/serializableRange';
 import { SerializableTextDocumentIdentifier } from '../rpc/serializableTextDocumentIdentifier';
 
 export interface SerializableSemanticTokensParams {
+    correlationId: string;
     textDocument: SerializableTextDocumentIdentifier;
-    range: SerializableRange;
+    ranges: SerializableRange[];
+    requiredHostDocumentVersion: number;
 }
diff --git a/src/razor/src/simplify/razorSimplifyMethodHandler.ts b/src/razor/src/simplify/razorSimplifyMethodHandler.ts
index 478a4547e..2c340e85c 100644
--- a/src/razor/src/simplify/razorSimplifyMethodHandler.ts
+++ b/src/razor/src/simplify/razorSimplifyMethodHandler.ts
@@ -13,9 +13,9 @@ import { RazorLanguageFeatureBase } from '../razorLanguageFeatureBase';
 import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
 import { RazorLogger } from '../razorLogger';
 import { SerializableDelegatedSimplifyMethodParams } from './serializableDelegatedSimplifyMethodParams';
-import { RoslynLanguageServer } from '../../../lsptoolshost/roslynLanguageServer';
 import SerializableSimplifyMethodParams from './serializableSimplifyMethodParams';
 import { TextEdit } from 'vscode-html-languageservice';
+import { roslynSimplifyMethodCommand } from '../../../lsptoolshost/razorCommands';
 
 export class RazorSimplifyMethodHandler extends RazorLanguageFeatureBase {
     private static readonly razorSimplifyMethodCommand = 'razor/simplifyMethod';
@@ -62,7 +62,7 @@ export class RazorSimplifyMethodHandler extends RazorLanguageFeatureBase {
 
         const params = new SerializableSimplifyMethodParams(identifier, request.textEdit);
         const response: TextEdit[] | undefined = await vscode.commands.executeCommand(
-            RoslynLanguageServer.roslynSimplifyMethodCommand,
+            roslynSimplifyMethodCommand,
             params
         );
 
diff --git a/src/razor/src/telemetryReporter.ts b/src/razor/src/telemetryReporter.ts
index 4d4385d86..5ed562d73 100644
--- a/src/razor/src/telemetryReporter.ts
+++ b/src/razor/src/telemetryReporter.ts
@@ -10,6 +10,7 @@ export class TelemetryReporter {
     private readonly razorExtensionActivated = createTelemetryEvent('VSCode.Razor.RazorExtensionActivated');
     private readonly debugLanguageServerEvent = createTelemetryEvent('VSCode.Razor.DebugLanguageServer');
     private readonly workspaceContainsRazorEvent = createTelemetryEvent('VSCode.Razor.WorkspaceContainsRazor');
+    private readonly buffersOutOfSyncEvent = createTelemetryEvent('VSCode.Razor.BuffersOutOfSync');
     private reportedWorkspaceContainsRazor = false;
 
     constructor(private readonly eventStream: HostEventStream) {
@@ -24,6 +25,10 @@ export class TelemetryReporter {
         this.eventStream.post(traceLevelEvent);
     }
 
+    public reportBuffersOutOfSync() {
+        this.eventStream.post(this.buffersOutOfSyncEvent);
+    }
+
     public reportErrorOnServerStart(error: unknown) {
         let realError;
         if (error instanceof Error) {
diff --git a/src/razor/syntaxes/aspnetcorerazor.tmLanguage.yml b/src/razor/syntaxes/aspnetcorerazor.tmLanguage.yml
new file mode 100644
index 000000000..46b2accdb
--- /dev/null
+++ b/src/razor/syntaxes/aspnetcorerazor.tmLanguage.yml
@@ -0,0 +1,928 @@
+name: ASP.NET Razor
+scopeName: text.aspnetcorerazor
+fileTypes:
+  - 'razor'
+  - 'cshtml'
+patterns:
+  - include: '#razor-control-structures'
+  - include: 'text.html.basic'
+
+repository:
+
+ # Razor control structures, including C# control structures that require an '@'
+  razor-control-structures:
+    patterns:
+      - include: '#razor-comment'
+      - include: '#razor-codeblock'
+      - include: '#explicit-razor-expression'
+      - include: '#escaped-transition'
+      - include: '#directives'
+      - include: '#transitioned-csharp-control-structures'
+      - include: '#implicit-expression'
+
+# Razor control structures, including C# control structures that don't require an '@' (ie, are nested in a C# context)
+  optionally-transitioned-razor-control-structures:
+    patterns:
+      - include: '#razor-comment'
+      - include: '#razor-codeblock'
+      - include: '#explicit-razor-expression'
+      - include: '#escaped-transition'
+      - include: '#directives'
+      - include: '#optionally-transitioned-csharp-control-structures'
+      - include: '#implicit-expression'
+
+  escaped-transition:
+    name: constant.character.escape.razor.transition
+    match: '@@'
+
+  transition:
+    match: '@'
+    name: keyword.control.cshtml.transition
+
+# ----------  Razor Code Block ------------
+
+  razor-codeblock:
+    name: 'meta.structure.razor.codeblock'
+    begin: '(@)(\{)'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.codeblock.open' }
+    contentName: 'source.cs'
+    patterns:
+      - include: '#razor-codeblock-body'
+    end: '(\})'
+    endCaptures:
+      1: { name: 'keyword.control.razor.directive.codeblock.close' }
+
+  razor-codeblock-body:
+    patterns:
+      - include: '#text-tag'
+      - include: '#wellformed-html'
+      - include: '#razor-single-line-markup'
+      - include: '#optionally-transitioned-razor-control-structures'
+      - include: 'source.cs'
+
+  razor-single-line-markup:
+    match: '(\@\:)([^$]*)$'
+    captures:
+      1: { name: 'keyword.control.razor.singleLineMarkup' }
+      2:
+        patterns:
+          - include: '#razor-control-structures'
+          - include: 'text.html.basic'
+
+  text-tag:
+    begin: '(<text\s*>)'
+    beginCaptures:
+      1: { name: 'keyword.control.cshtml.transition.textTag.open' }
+    patterns:
+      - include: '#wellformed-html'
+      - include: '$self'
+    end: '(</text>)'
+    endCaptures:
+      1: { name: 'keyword.control.cshtml.transition.textTag.close' }
+
+# --------- Razor Comment -----------
+
+  razor-comment:
+    name: 'meta.comment.razor'
+    begin: '(@)(\*)'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.comment.star' }
+    contentName: 'comment.block.razor'
+    end: '(\*)(@)'
+    endCaptures:
+      1: { name: 'keyword.control.razor.comment.star' }
+      2: { patterns: [ include: '#transition']}
+
+# ----------  HTML ------------
+
+  wellformed-html:
+    patterns:
+      - include: '#void-tag'
+      - include: '#non-void-tag'
+
+  # Void tags are well-known tags that do not have an end tag *and* are not required to be self-closing.
+  # https://html.spec.whatwg.org/multipage/syntax.html#void-elements
+  void-tag:
+    name: 'meta.tag.structure.$3.void.html'
+    begin: '(?i)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\s|/?>)'
+    beginCaptures:
+      1: { name: 'punctuation.definition.tag.begin.html'}
+      2: { name: 'constant.character.escape.razor.tagHelperOptOut' }
+      3: { name: 'entity.name.tag.html' }
+    patterns:
+      - include: 'text.html.basic#attribute'
+    end: '/?>'
+    endCaptures:
+      0: { name: 'punctuation.definition.tag.end.html' }
+
+  # This is some complicated trickery to be able to detect & match
+  # self-closing components as well as *matching* elements with begin/end tags,
+  # more-or-less copied from microsoft/TypeScript-TmLanguage's TSX grammar.
+  # Basically - we match both ways a tag can be closed (self-closing or an end tag),
+  # and leave the inner patterns to figure out which one we matched.
+  non-void-tag:
+    begin: '(?=<(!)?([^/\s>]+)(\s|/?>))'
+    end: '(</)(\2)\s*(>)|(/>)' # The \2 back-references the second capture in 'begin', for matching tags
+    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: '(<)(!)?([^/\s>]+)(?=\s|/?>)'
+        beginCaptures:
+          1: { name: 'punctuation.definition.tag.begin.html' }
+          2: { name: 'constant.character.escape.razor.tagHelperOptOut' }
+          3: { name: 'entity.name.tag.html' }
+        end: '(?=/?>)'
+        patterns:
+          - include: '#razor-control-structures'
+          - include: 'text.html.basic#attribute'
+      - begin: '>'
+        beginCaptures:
+          0: { name: 'punctuation.definition.tag.end.html' }
+        end: '(?=</)'
+        patterns:
+          - include: '#wellformed-html'
+          - include: '$self'
+
+# ----------  Explicit Expression ------------
+
+  explicit-razor-expression:
+    name: 'meta.expression.explicit.cshtml'
+    begin: '(@)\('
+    beginCaptures:
+      0: { name: 'keyword.control.cshtml' }
+      1: { patterns: [ include: '#transition' ] }
+    patterns:
+      - include: 'source.cs#expression'
+    end: '\)'
+    endCaptures:
+      0: { name: 'keyword.control.cshtml' }
+
+# ----------  Implicit Expression ------------
+
+  implicit-expression:
+    name: 'meta.expression.implicit.cshtml'
+    contentName: 'source.cs'
+    begin: '(?<![[:alpha:][:alnum:]])(@)'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+    patterns:
+      - include: '#await-prefix'
+      - include: '#implicit-expression-body'
+    end: '(?=[\s<>\{\}\)\]''"])'
+
+  implicit-expression-body:
+    patterns:
+      - include: '#implicit-expression-invocation-start'
+      - include: '#implicit-expression-accessor-start'
+    end: '(?=[\s<>\{\}\)\]''"])'
+
+  # CSharp colors method invocations differently than accessors
+  # This captures situations where you do @SomeMethod()
+  implicit-expression-invocation-start:
+    begin: '([_[:alpha:]][_[:alnum:]]*)(?=\()'
+    beginCaptures:
+      1: { name: 'entity.name.function.cs' }
+    patterns:
+      - include: '#implicit-expression-continuation'
+    end: '(?=[\s<>\{\}\)\]''"])'
+
+  # CSharp colors property accessors differently than methods
+  # This captures situations where you do @SomeProperty
+  implicit-expression-accessor-start:
+    begin: '([_[:alpha:]][_[:alnum:]]*)'
+    beginCaptures:
+      1: { name: 'variable.other.object.cs' }
+    patterns:
+      - include: '#implicit-expression-continuation'
+    end: '(?=[\s<>\{\}\)\]''"])'
+
+  implicit-expression-continuation:
+    patterns:
+      - include: '#balanced-parenthesis-csharp'
+      - include: '#balanced-brackets-csharp'
+      - include: '#implicit-expression-invocation'
+      - include: '#implicit-expression-accessor'
+      - include: '#implicit-expression-extension'
+    end: '(?=[\s<>\{\}\)\]''"])'
+
+  implicit-expression-accessor:
+    match: '(?<=\.)[_[:alpha:]][_[:alnum:]]*'
+    name: 'variable.other.object.property.cs'
+
+  implicit-expression-invocation:
+    match: '(?<=\.)[_[:alpha:]][_[:alnum:]]*(?=\()'
+    name: 'entity.name.function.cs'
+
+  implicit-expression-operator:
+    patterns:
+      - include: '#implicit-expression-dot-operator'
+      - include: '#implicit-expression-null-conditional-operator'
+      - include: '#implicit-expression-null-forgiveness-operator'
+
+  implicit-expression-dot-operator:
+    match: '(\.)(?=[_[:alpha:]][_[:alnum:]]*)'
+    captures:
+      1: { name: 'punctuation.accessor.cs' }
+
+  implicit-expression-null-conditional-operator:
+    match: '(\?)(?=[.\[])'
+    captures:
+      1: { name: 'keyword.operator.null-conditional.cs' }
+
+  implicit-expression-null-forgiveness-operator:
+    match: '(\!)(?=(?:\.[_[:alpha:]][_[:alnum:]]*)|\?|[\[\(])'
+    captures:
+      1: { name: 'keyword.operator.logical.cs' }
+
+  balanced-parenthesis-csharp:
+    begin: '(\()'
+    beginCaptures:
+      1: { name: 'punctuation.parenthesis.open.cs' }
+    name: 'razor.test.balanced.parenthesis'
+    patterns:
+      - include: 'source.cs'
+    end: '(\))'
+    endCaptures:
+      1: { name: 'punctuation.parenthesis.close.cs' }
+
+  balanced-brackets-csharp:
+    begin: '(\[)'
+    beginCaptures:
+      1: { name: 'punctuation.squarebracket.open.cs' }
+    name: 'razor.test.balanced.brackets'
+    patterns:
+      - include: 'source.cs'
+    end: '(\])'
+    endCaptures:
+      1: { name: 'punctuation.squarebracket.close.cs' }
+
+# ----------  Directives ------------
+
+  directives:
+    patterns:
+      - include: '#code-directive'
+      - include: '#functions-directive'
+      - include: '#page-directive'
+      - include: '#addTagHelper-directive'
+      - include: '#removeTagHelper-directive'
+      - include: '#tagHelperPrefix-directive'
+      - include: '#model-directive'
+      - include: '#inherits-directive'
+      - include: '#implements-directive'
+      - include: '#namespace-directive'
+      - include: '#inject-directive'
+      - include: '#attribute-directive'
+      - include: '#section-directive'
+      - include: '#layout-directive'
+      - include: '#using-directive'
+
+  #>>>>> @code and @functions <<<<<
+
+  code-directive:
+    begin: '(@)(code)((?=\{)|\s+)'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.code'}
+    patterns:
+      - include: '#directive-codeblock'
+    end: '(?<=})|\s'
+
+  functions-directive:
+    begin: '(@)(functions)((?=\{)|\s+)'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.functions'}
+    patterns:
+      - include: '#directive-codeblock'
+    end: '(?<=})|\s'
+
+  directive-codeblock:
+    begin: '(\{)'
+    beginCaptures:
+      1: { name: 'keyword.control.razor.directive.codeblock.open' }
+    name: 'meta.structure.razor.directive.codeblock'
+    contentName: 'source.cs'
+    patterns:
+      - include: 'source.cs#class-or-struct-members'
+    end: '(\})'
+    endCaptures:
+      1: { name: 'keyword.control.razor.directive.codeblock.close' }
+
+  #>>>>> @page <<<<<
+
+  page-directive:
+    name: 'meta.directive'
+    match: '(@)(page)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.page'}
+      3: { patterns: [ include: 'source.cs#string-literal' ] }
+
+  #>>>>> @addTagHelper, @removeTagHelper and @tagHelperPrefix <<<<<
+
+  addTagHelper-directive:
+    name: 'meta.directive'
+    match: '(@)(addTagHelper)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.addTagHelper'}
+      3: { patterns: [ include: '#tagHelper-directive-argument' ] }
+
+  removeTagHelper-directive:
+    name: 'meta.directive'
+    match: '(@)(removeTagHelper)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.removeTagHelper'}
+      3: { patterns: [ include: '#tagHelper-directive-argument' ] }
+
+  tagHelperPrefix-directive:
+    name: 'meta.directive'
+    match: '(@)(tagHelperPrefix)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.tagHelperPrefix'}
+      3: { patterns: [ include: '#tagHelper-directive-argument' ] }
+
+  tagHelper-directive-argument:
+    patterns:
+      - include: 'source.cs#string-literal'
+      - include: '#unquoted-string-argument'
+
+  unquoted-string-argument:
+    name: 'string.quoted.double.cs'
+    match: '[^$]+'
+
+  #>>>>> @model, layout, @implements and @inherits <<<<<
+
+  model-directive:
+    name: 'meta.directive'
+    match: '(@)(model)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.model'}
+      3: { patterns: [ include: 'source.cs#type' ] }
+
+  inherits-directive:
+    name: 'meta.directive'
+    match: '(@)(inherits)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.inherits'}
+      3: { patterns: [ include: 'source.cs#type' ] }
+
+  implements-directive:
+    name: 'meta.directive'
+    match: '(@)(implements)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.implements'}
+      3: { patterns: [ include: 'source.cs#type' ] }
+
+  layout-directive:
+    name: 'meta.directive'
+    match: '(@)(layout)\s+([^$]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.layout'}
+      3: { patterns: [ include: 'source.cs#type' ] }
+
+  #>>>>> @namespace <<<<<
+
+  namespace-directive:
+    name: 'meta.directive'
+    match: '(@)(namespace)\s+([^\s]+)?'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.namespace'}
+      3: { patterns: [ include: '#namespace-directive-argument' ] }
+
+  namespace-directive-argument:
+    match: '([_[:alpha:]][_[:alnum:]]*)(\.)?'
+    captures:
+      1: { name: 'entity.name.type.namespace.cs' }
+      2: { name: 'punctuation.accessor.cs' }
+
+  #>>>>> @inject <<<<<
+
+  inject-directive:
+    name: 'meta.directive'
+    match: '(@)(inject)\s*([\S\s]+?)?\s*([_[:alpha:]][_[:alnum:]]*)?\s*(?=$)'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.inject'}
+      3: { patterns: [ include: 'source.cs#type' ] }
+      4: { name: 'entity.name.variable.property.cs' }
+
+  #>>>>> @attribute <<<<<
+
+  attribute-directive:
+    name: 'meta.directive'
+    begin: '(@)(attribute)\b\s+'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.attribute'}
+    patterns:
+      - include: 'source.cs#attribute-section'
+    end: '(?<=\])|$'
+
+  #>>>>> @section <<<<<
+
+  section-directive:
+    name: 'meta.directive.block'
+    begin: '(@)(section)\b\s+([_[:alpha:]][_[:alnum:]]*)?'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.razor.directive.section'}
+      3: { name: 'variable.other.razor.directive.sectionName' }
+    patterns:
+      - include: '#directive-markupblock'
+    end: '(?<=})'
+
+  directive-markupblock:
+    name: 'meta.structure.razor.directive.markblock'
+    begin: '(\{)'
+    beginCaptures:
+      1: { name: 'keyword.control.razor.directive.codeblock.open' }
+    patterns:
+      - include: '$self'
+    end: '(\})'
+    endCaptures:
+      1: { name: 'keyword.control.razor.directive.codeblock.close' }
+
+  #>>>>> @using <<<<<
+
+  using-directive:
+    name: 'meta.directive'
+    match: '(@)(using)\b\s+(?!\(|\s)(.+?)?(;)?$'
+    captures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.other.using.cs'}
+      3:
+        patterns:
+          - include: '#using-static-directive'
+          - include: '#using-alias-directive'
+          - include: '#using-standard-directive'
+      4: { name: 'keyword.control.razor.optionalSemicolon'}
+
+  using-static-directive:
+    match: '(static)\b\s+(.+)'
+    captures:
+      1: { name: 'keyword.other.static.cs' }
+      2: { patterns: [ include: 'source.cs#type' ] }
+
+  using-alias-directive:
+    match: '([_[:alpha:]][_[:alnum:]]*)\b\s*(=)\s*(.+)\s*'
+    captures:
+      1: { name: 'entity.name.type.alias.cs' }
+      2: { name: 'keyword.operator.assignment.cs' }
+      3: { patterns: [ include: 'source.cs#type' ] }
+
+  using-standard-directive:
+    match: '([_[:alpha:]][_[:alnum:]]*)\s*'
+    captures:
+      1: { name: 'entity.name.type.namespace.cs' }
+
+  # ----------  Razor C# Control Structures ------------
+
+  optionally-transitioned-csharp-control-structures:
+    patterns:
+      - include: '#using-statement-with-optional-transition'
+      - include: '#if-statement-with-optional-transition'
+      - include: '#else-part'
+      - include: '#foreach-statement-with-optional-transition'
+      - include: '#for-statement-with-optional-transition'
+  # while is incompatible with optional transitions because @do { } \n while { } is valid everywhere, and textmate only matches
+  # one line at a time
+      - include: '#while-statement'
+      - include: '#switch-statement-with-optional-transition'
+      - include: '#lock-statement-with-optional-transition'
+      - include: '#do-statement-with-optional-transition'
+      - include: '#try-statement-with-optional-transition'
+
+  transitioned-csharp-control-structures:
+    patterns:
+      - include: '#using-statement'
+      - include: '#if-statement'
+      - include: '#else-part'
+      - include: '#foreach-statement'
+      - include: '#for-statement'
+      - include: '#while-statement'
+      - include: '#switch-statement'
+      - include: '#lock-statement'
+      - include: '#do-statement'
+      - include: '#try-statement'
+
+  #>>>>> @using (...) { ... } <<<<<
+
+  using-statement:
+    name: 'meta.statement.using.razor'
+    begin: '(?:(@))(using)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.other.using.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  using-statement-with-optional-transition:
+    name: 'meta.statement.using.razor'
+    begin: '(?:^\s*|(@))(using)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.other.using.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  #>>>>> @if (...) { ... } <<<<<
+
+  if-statement:
+    name: 'meta.statement.if.razor'
+    begin: '(?:(@))(if)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.conditional.if.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  if-statement-with-optional-transition:
+    name: 'meta.statement.if.razor'
+    begin: '(?:^\s*|(@))(if)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.conditional.if.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  #>>>>> else [if (...)] { ... } <<<<<
+
+  else-part:
+    name: 'meta.statement.else.razor'
+    begin: '(?:^|(?<=}))\s*(else)\b\s*?(?: (if))?\s*?(?=[\n\(\{])'
+    beginCaptures:
+      1: { name: 'keyword.control.conditional.else.cs' }
+      2: { name: 'keyword.control.conditional.if.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  #>>>>> @for (...) { ... } <<<<<
+
+  for-statement:
+    name: 'meta.statement.for.razor'
+    begin: '(?:(@))(for)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.loop.for.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  for-statement-with-optional-transition:
+    name: 'meta.statement.for.razor'
+    begin: '(?:^\s*|(@))(for)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.loop.for.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  #>>>>> @foreach (...) { ... } <<<<<
+
+  foreach-statement:
+    name: 'meta.statement.foreach.razor'
+    begin: '(?:(@)(await\s+)?)(foreach)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { patterns: [ include: '#await-prefix' ] }
+      3: { name: 'keyword.control.loop.foreach.cs' }
+    patterns:
+      - include: '#foreach-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  foreach-statement-with-optional-transition:
+    name: 'meta.statement.foreach.razor'
+    begin: '(?:^\s*|(@)(await\s+)?)(foreach)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { patterns: [ include: '#await-prefix' ] }
+      3: { name: 'keyword.control.loop.foreach.cs' }
+    patterns:
+      - include: '#foreach-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  # This condition is pulled directly from the C# grammar for foreach statements
+  foreach-condition:
+    begin: '\('
+    beginCaptures:
+      0: { name: 'punctuation.parenthesis.open.cs' }
+    end: '\)'
+    endCaptures:
+      0: { name: 'punctuation.parenthesis.close.cs' }
+    patterns:
+      - match: |-
+          (?x)
+          (?:
+            (\bvar\b)|
+            (?<type-name>
+              (?:
+                (?:
+                  (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
+                  (?<name-and-type-args> # identifier + type arguments (if any)
+                    \g<identifier>\s*
+                    (?<type-args>\s*<(?:[^<>]|\g<type-args>)+>\s*)?
+                  )
+                  (?:\s*\.\s*\g<name-and-type-args>)* | # Are there any more names being dotted into?
+                  (?<tuple>\s*\((?:[^\(\)]|\g<tuple>)+\))
+                )
+                (?:\s*\?\s*)? # nullable suffix?
+                (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
+              )
+            )
+          )\s+
+          (\g<identifier>)\s+
+          \b(in)\b
+        captures:
+          1: { name: 'keyword.other.var.cs' }
+          2:
+            patterns:
+              - include: 'source.cs#type'
+          # '3': ?<identifier> is a sub-expression. It's final value is not considered.
+          # '4': ?<name-and-type-args> is a sub-expression. It's final value is not considered.
+          # '5': ?<type-args> is a sub-expression. It's final value is not considered.
+          # '6': ?<tuple> is a sub-expression. It's final value is not considered.
+          7: { name: 'entity.name.variable.local.cs' }
+          8: { name: 'keyword.control.loop.in.cs' }
+      - match: |-
+          (?x) # match foreach (var (x, y) in ...)
+          (?:\b(var)\b\s*)?
+          (?<tuple>\((?:[^\(\)]|\g<tuple>)+\))\s+
+          \b(in)\b
+        captures:
+          1: { name: 'keyword.other.var.cs' }
+          2:
+            patterns:
+              - include: 'source.cs#tuple-declaration-deconstruction-element-list'
+          3: { name: 'keyword.control.loop.in.cs' }
+      - include: 'source.cs#expression'
+
+  #>>>>> @do (...) while { ... } <<<<<
+
+  do-statement:
+    name: 'meta.statement.do.razor'
+    begin: '(?:(@))(do)\b\s'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.loop.do.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  do-statement-with-optional-transition:
+    name: 'meta.statement.do.razor'
+    begin: '(?:^\s*|(@))(do)\b\s'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.loop.do.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  #>>>>> @while (...) { ... } <<<<<
+
+  while-statement:
+    name: 'meta.statement.while.razor'
+    begin: '(?:(@)|^\s*|(?<=})\s*)(while)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.loop.while.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})|(;)'
+    endCaptures:
+      1: { name: 'punctuation.terminator.statement.cs'}
+
+  #>>>>> @switch (...) { ... } <<<<<
+
+  switch-statement:
+    name: 'meta.statement.switch.razor'
+    begin: '(?:(@))(switch)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.switch.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#switch-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  switch-statement-with-optional-transition:
+    name: 'meta.statement.switch.razor'
+    begin: '(?:^\s*|(@))(switch)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.switch.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#switch-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  switch-code-block:
+    name: 'meta.structure.razor.csharp.codeblock.switch'
+    begin: '(\{)'
+    beginCaptures:
+      1: { name: 'punctuation.curlybrace.open.cs' }
+    patterns:
+      - include: 'source.cs#switch-label'
+      - include: '#razor-codeblock-body'
+    end: '(\})'
+    endCaptures:
+      1: { name: 'punctuation.curlybrace.close.cs' }
+
+  #>>>>> @lock (...) { ... } <<<<<
+
+  lock-statement:
+    name: 'meta.statement.lock.razor'
+    begin: '(?:(@))(lock)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.other.lock.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  lock-statement-with-optional-transition:
+    name: 'meta.statement.lock.razor'
+    begin: '(?:^\s*|(@))(lock)\b\s*(?=\()'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.other.lock.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  #>>>>> @try { ... } [catch|finally] (...) { ... } <<<<<
+
+  try-statement:
+    patterns:
+      - include: '#try-block'
+      - include: '#catch-clause'
+      - include: '#finally-clause'
+
+  try-statement-with-optional-transition:
+    patterns:
+      - include: '#try-block-with-optional-transition'
+      - include: '#catch-clause'
+      - include: '#finally-clause'
+
+  try-block:
+    name: 'meta.statement.try.razor'
+    begin: '(?:(@))(try)\b\s*'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.try.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  try-block-with-optional-transition:
+    name: 'meta.statement.try.razor'
+    begin: '(?:^\s*|(@))(try)\b\s*'
+    beginCaptures:
+      1: { patterns: [ include: '#transition' ] }
+      2: { name: 'keyword.control.try.cs' }
+    patterns:
+      - include: '#csharp-condition'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  catch-clause:
+    name: 'meta.statement.catch.razor'
+    begin: '(?:^|(?<=}))\s*(catch)\b\s*?(?=[\n\(\{])'
+    beginCaptures:
+      1: { name: 'keyword.control.try.catch.cs' }
+    patterns:
+      - include: '#catch-condition'
+      - include: 'source.cs#when-clause'
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  # This condition is pulled directly from the C# grammar for catch clauses
+  catch-condition:
+    begin: '\('
+    beginCaptures:
+      0: { name: 'punctuation.parenthesis.open.cs' }
+    end: '\)'
+    endCaptures:
+      0: { name: 'punctuation.parenthesis.close.cs' }
+    patterns:
+      - match: |-
+          (?x)
+          (?<type-name>
+            (?:
+              (?:
+                (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
+                (?<name-and-type-args> # identifier + type arguments (if any)
+                  \g<identifier>\s*
+                  (?<type-args>\s*<(?:[^<>]|\g<type-args>)+>\s*)?
+                )
+                (?:\s*\.\s*\g<name-and-type-args>)* | # Are there any more names being dotted into?
+                (?<tuple>\s*\((?:[^\(\)]|\g<tuple>)+\))
+              )
+              (?:\s*\?\s*)? # nullable suffix?
+              (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
+            )
+          )\s*
+          (?:(\g<identifier>)\b)?
+        captures:
+          1:
+            patterns:
+              - include: 'source.cs#type'
+          # '2': ?<identifier> is a sub-expression. It's final value is not considered.
+          # '3': ?<name-and-type-args> is a sub-expression. It's final value is not considered.
+          # '4': ?<type-args> is a sub-expression. It's final value is not considered.
+          # '5': ?<tuple> is a sub-expression. It's final value is not considered.
+          6: { name: entity.name.variable.local.cs }
+
+  finally-clause:
+    name: 'meta.statement.finally.razor'
+    begin: '(?:^|(?<=}))\s*(finally)\b\s*?(?=[\n\{])'
+    beginCaptures:
+      1: { name: 'keyword.control.try.finally.cs' }
+    patterns:
+      - include: '#csharp-code-block'
+      - include: '#razor-codeblock-body'
+    end: '(?<=})'
+
+  # ----------  Misc C# ------------
+
+  await-prefix:
+    name: 'keyword.other.await.cs'
+    match: '(await)\s+'
+
+  csharp-code-block:
+    name: 'meta.structure.razor.csharp.codeblock'
+    begin: '(\{)'
+    beginCaptures:
+      1: { name: 'punctuation.curlybrace.open.cs' }
+    patterns:
+      - include: '#razor-codeblock-body'
+    end: '(\})'
+    endCaptures:
+      1: { name: 'punctuation.curlybrace.close.cs' }
+
+  csharp-condition:
+    begin: '(\()'
+    beginCaptures:
+      1: { name: 'punctuation.parenthesis.open.cs' }
+    patterns:
+      - include: 'source.cs#local-variable-declaration'
+      - include: 'source.cs#expression'
+      - include: 'source.cs#punctuation-comma'
+      - include: 'source.cs#punctuation-semicolon'
+    end: '(\))'
+    endCaptures:
+      1: { name: 'punctuation.parenthesis.close.cs' }
\ No newline at end of file
diff --git a/src/shared/assets.ts b/src/shared/assets.ts
index 164fc6aa1..41a7db31d 100644
--- a/src/shared/assets.ts
+++ b/src/shared/assets.ts
@@ -293,7 +293,7 @@ export class AssetGenerator {
         }
 
         commandArgs.push('/property:GenerateFullPaths=true');
-        commandArgs.push('/consoleloggerparameters:NoSummary');
+        commandArgs.push('/consoleloggerparameters:NoSummary;ForceNoAlign');
     }
 
     private getBuildProjectPath(): string | null {
@@ -571,7 +571,8 @@ export async function getBuildOperations(generator: AssetGenerator): Promise<Ass
                     try {
                         tasksConfiguration = tolerantParse(text);
                     } catch (error) {
-                        vscode.window.showErrorMessage(vscode.l10n.t('Failed to parse tasks.json file'));
+                        const message = error instanceof Error ? error.message : `${error}`;
+                        vscode.window.showErrorMessage(vscode.l10n.t('Failed to parse tasks.json file: {0}', message));
                         return resolve({ updateTasksJson: false });
                     }
 
diff --git a/src/shared/configurationProvider.ts b/src/shared/configurationProvider.ts
index c6c645661..996bb989f 100644
--- a/src/shared/configurationProvider.ts
+++ b/src/shared/configurationProvider.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { ParsedEnvironmentFile } from '../coreclrDebug/parsedEnvironmentFile';
-import { getBrokeredServicePipeName } from '../coreclrDebug/activate';
+import { debugSessionTracker } from '../coreclrDebug/provisionalDebugSessionTracker';
 
 import { MessageItem } from '../vscodeAdapter';
 import { CertToolStatusCodes, createSelfSignedCert, hasDotnetDevCertsHttps } from '../utils/dotnetDevCertsHttps';
@@ -16,8 +16,8 @@ import {
     AttachPicker,
 } from '../features/processPicker';
 import { PlatformInformation } from './platform';
-import OptionProvider from './observers/optionProvider';
 import { getCSharpDevKit } from '../utils/getCSharpDevKit';
+import { commonOptions } from './options';
 
 /**
  * Class used for debug configurations that will be sent to the debugger registered by {@link DebugAdapterExecutableFactory}
@@ -30,7 +30,6 @@ import { getCSharpDevKit } from '../utils/getCSharpDevKit';
 export class BaseVsDbgConfigurationProvider implements vscode.DebugConfigurationProvider {
     public constructor(
         protected platformInformation: PlatformInformation,
-        private optionProvider: OptionProvider,
         private csharpOutputChannel: vscode.OutputChannel
     ) {}
 
@@ -67,7 +66,7 @@ export class BaseVsDbgConfigurationProvider implements vscode.DebugConfiguration
             return null;
         }
 
-        const brokeredServicePipeName = getBrokeredServicePipeName();
+        const brokeredServicePipeName = debugSessionTracker.getBrokeredServicePipeName();
         if (brokeredServicePipeName !== undefined) {
             debugConfiguration.brokeredServicePipeName = brokeredServicePipeName;
         }
@@ -77,7 +76,12 @@ export class BaseVsDbgConfigurationProvider implements vscode.DebugConfiguration
                 debugConfiguration.cwd = folder?.uri.fsPath; // Workspace folder
             }
 
-            debugConfiguration.internalConsoleOptions ??= 'openOnSessionStart';
+            if (!debugConfiguration.internalConsoleOptions) {
+                // If the target app is NOT using integratedTerminal, use 'openOnSessionStart' so that the debug console can be seen
+                // If the target app is using integratedTerminal, use 'neverOpen' so that the integrated terminal doesn't get hidden
+                debugConfiguration.internalConsoleOptions =
+                    debugConfiguration.console === 'integratedTerminal' ? 'neverOpen' : 'openOnSessionStart';
+            }
 
             // read from envFile and set config.env
             if (debugConfiguration.envFile !== undefined && debugConfiguration.envFile.length > 0) {
@@ -141,7 +145,7 @@ export class BaseVsDbgConfigurationProvider implements vscode.DebugConfiguration
             }
 
             if (debugConfiguration.checkForDevCert) {
-                this.checkForDevCerts(this.optionProvider.GetLatestOptions().commonOptions.dotnetPath);
+                this.checkForDevCerts(commonOptions.dotnetPath);
             }
         }
 
diff --git a/src/shared/constants/IHostExecutableResolver.ts b/src/shared/constants/IHostExecutableResolver.ts
index c470ccdb7..f1c783ef6 100644
--- a/src/shared/constants/IHostExecutableResolver.ts
+++ b/src/shared/constants/IHostExecutableResolver.ts
@@ -3,9 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Options } from '../options';
 import { HostExecutableInformation } from './hostExecutableInformation';
 
 export interface IHostExecutableResolver {
-    getHostExecutableInfo(options: Options): Promise<HostExecutableInformation>;
+    getHostExecutableInfo(): Promise<HostExecutableInformation>;
 }
diff --git a/src/shared/dotnetConfigurationProvider.ts b/src/shared/dotnetConfigurationProvider.ts
index 25c216bbd..4cb2e3513 100644
--- a/src/shared/dotnetConfigurationProvider.ts
+++ b/src/shared/dotnetConfigurationProvider.ts
@@ -139,8 +139,19 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro
         }
         if (debugConfigArray.length == 1) {
             return debugConfigArray[0];
-        } else if (debugConfigArray.length > 1) {
-            throw new InternalServiceError('Multiple launch targets is not yet supported.');
+        } else if (debugConfigArray.length === 2) {
+            // This creates a onDidStartDebugSession event listener that will dispose of itself when it detects
+            // the debugConfiguration that is return from this method has started.
+            const startDebugEvent = vscode.debug.onDidStartDebugSession((debugSession: vscode.DebugSession) => {
+                if (debugSession.name === debugConfigArray[0].name) {
+                    startDebugEvent.dispose();
+                    vscode.debug.startDebugging(debugSession.workspaceFolder, debugConfigArray[1], debugSession);
+                }
+            });
+
+            return debugConfigArray[0];
+        } else if (debugConfigArray.length > 2) {
+            throw new InternalServiceError('Multiple launch targets (>2) is not yet supported.');
         } else {
             throw new InternalServiceError(
                 'Unexpected configuration array from IDotnetDebugConfigurationServiceResult.'
diff --git a/src/shared/migrateOptions.ts b/src/shared/migrateOptions.ts
index 1405f10eb..0f6b50401 100644
--- a/src/shared/migrateOptions.ts
+++ b/src/shared/migrateOptions.ts
@@ -70,6 +70,10 @@ export const migrateOptions = [
         omnisharpOption: 'csharp.unitTestDebuggingOptions',
         roslynOption: 'dotnet.unitTestDebuggingOptions',
     },
+    {
+        omnisharpOption: 'omnisharp.testRunSettings',
+        roslynOption: 'dotnet.unitTests.runSettingsPath',
+    },
 ];
 
 export async function MigrateOptions(vscode: vscode): Promise<void> {
diff --git a/src/shared/observables/createOptionStream.ts b/src/shared/observables/createOptionStream.ts
index 955ab642a..b803cd326 100644
--- a/src/shared/observables/createOptionStream.ts
+++ b/src/shared/observables/createOptionStream.ts
@@ -3,13 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Options } from '../options';
 import { vscode } from '../../vscodeAdapter';
 import { Observable, Observer } from 'rxjs';
 import { publishBehavior } from 'rxjs/operators';
 
-export default function createOptionStream(vscode: vscode): Observable<Options> {
-    return Observable.create((observer: Observer<Options>) => {
+export default function createOptionStream(vscode: vscode): Observable<void> {
+    return Observable.create((observer: Observer<void>) => {
         const disposable = vscode.workspace.onDidChangeConfiguration((e) => {
             //if the omnisharp or csharp configuration are affected only then read the options
             if (
@@ -17,12 +16,16 @@ export default function createOptionStream(vscode: vscode): Observable<Options>
                 e.affectsConfiguration('omnisharp') ||
                 e.affectsConfiguration('csharp')
             ) {
-                observer.next(Options.Read(vscode));
+                observer.next();
             }
         });
 
         return () => disposable.dispose();
     })
-        .pipe(publishBehavior(Options.Read(vscode)))
+        .pipe(
+            publishBehavior(() => {
+                return;
+            })
+        )
         .refCount();
 }
diff --git a/src/shared/observers/optionChangeObserver.ts b/src/shared/observers/optionChangeObserver.ts
index e43f8c794..b35fb396e 100644
--- a/src/shared/observers/optionChangeObserver.ts
+++ b/src/shared/observers/optionChangeObserver.ts
@@ -3,30 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CommonOptions, LanguageServerOptions, OmnisharpServerOptions, Options } from '../options';
 import { Observable } from 'rxjs';
 import Disposable from '../../disposable';
 import { isDeepStrictEqual } from 'util';
+import {
+    CommonOptions,
+    LanguageServerOptions,
+    OmnisharpServerOptions,
+    commonOptions,
+    languageServerOptions,
+    omnisharpOptions,
+} from '../options';
+
+type RelevantOptionValues = {
+    commonOptions: Map<keyof CommonOptions, any>;
+    omnisharpOptions: Map<keyof OmnisharpServerOptions, any>;
+    languageServerOptions: Map<keyof LanguageServerOptions, any>;
+};
 
 export function HandleOptionChanges(
-    optionObservable: Observable<Options>,
+    optionObservable: Observable<void>,
     optionChangeObserver: OptionChangeObserver
 ): Disposable {
-    let oldOptions: Options;
-    const subscription = optionObservable.pipe().subscribe((newOptions) => {
+    let oldOptions: RelevantOptionValues;
+    const subscription = optionObservable.pipe().subscribe(() => {
+        const changedKeys = optionChangeObserver.getRelevantOptions();
+        const newOptions = getLatestRelevantOptions(changedKeys);
         if (!oldOptions) {
             oldOptions = newOptions;
-            return;
         }
-        const relevantOptions = optionChangeObserver.getRelevantOptions();
-        const changedRelevantCommonOptions = relevantOptions.changedCommonOptions.filter(
-            (key) => !isDeepStrictEqual(oldOptions.commonOptions[key], newOptions.commonOptions[key])
+
+        const changedRelevantCommonOptions = changedKeys.changedCommonOptions.filter(
+            (key) => !isDeepStrictEqual(oldOptions.commonOptions.get(key), newOptions.commonOptions.get(key))
         );
-        const changedRelevantLanguageServerOptions = relevantOptions.changedLanguageServerOptions.filter(
-            (key) => !isDeepStrictEqual(oldOptions.languageServerOptions[key], newOptions.languageServerOptions[key])
+        const changedRelevantLanguageServerOptions = changedKeys.changedLanguageServerOptions.filter(
+            (key) =>
+                !isDeepStrictEqual(oldOptions.languageServerOptions.get(key), newOptions.languageServerOptions.get(key))
         );
-        const changedRelevantOmnisharpOptions = relevantOptions.changedOmnisharpOptions.filter(
-            (key) => !isDeepStrictEqual(oldOptions.omnisharpOptions[key], newOptions.omnisharpOptions[key])
+        const changedRelevantOmnisharpOptions = changedKeys.changedOmnisharpOptions.filter(
+            (key) => !isDeepStrictEqual(oldOptions.omnisharpOptions.get(key), newOptions.omnisharpOptions.get(key))
         );
 
         oldOptions = newOptions;
@@ -57,3 +72,13 @@ export interface OptionChanges {
     changedLanguageServerOptions: ReadonlyArray<keyof LanguageServerOptions>;
     changedOmnisharpOptions: ReadonlyArray<keyof OmnisharpServerOptions>;
 }
+
+function getLatestRelevantOptions(changedKeys: OptionChanges): RelevantOptionValues {
+    return {
+        commonOptions: new Map(changedKeys.changedCommonOptions.map((key) => [key, commonOptions[key]])),
+        omnisharpOptions: new Map(changedKeys.changedOmnisharpOptions.map((key) => [key, omnisharpOptions[key]])),
+        languageServerOptions: new Map(
+            changedKeys.changedLanguageServerOptions.map((key) => [key, languageServerOptions[key]])
+        ),
+    };
+}
diff --git a/src/shared/observers/optionProvider.ts b/src/shared/observers/optionProvider.ts
deleted file mode 100644
index 0e0ccf72d..000000000
--- a/src/shared/observers/optionProvider.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Options } from '../options';
-import { Subscription, Observable } from 'rxjs';
-export default class OptionProvider {
-    private options?: Options;
-    private subscription: Subscription;
-
-    constructor(optionObservable: Observable<Options>) {
-        this.subscription = optionObservable.subscribe((options) => (this.options = options));
-    }
-
-    public GetLatestOptions(): Options {
-        if (!this.options) {
-            throw new Error('Error reading OmniSharp options');
-        }
-
-        return this.options;
-    }
-
-    public dispose = () => {
-        this.subscription.unsubscribe();
-    };
-}
diff --git a/src/shared/options.ts b/src/shared/options.ts
index 7c274adb9..cb54eb800 100644
--- a/src/shared/options.ts
+++ b/src/shared/options.ts
@@ -3,53 +3,106 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
 import { DocumentSelector } from 'vscode-languageserver-protocol';
-import { vscode, WorkspaceConfiguration } from '../vscodeAdapter';
 import * as path from 'path';
 
-export class Options {
-    constructor(
-        public commonOptions: CommonOptions,
-        public omnisharpOptions: OmnisharpServerOptions,
-        public languageServerOptions: LanguageServerOptions,
-        public razorOptions: RazorOptions
-    ) {}
+export interface CommonOptions {
+    readonly dotnetPath: string;
+    readonly waitForDebugger: boolean;
+    readonly serverPath: string;
+    readonly useOmnisharpServer: boolean;
+    readonly excludePaths: string[];
 
-    public static Read(vscode: vscode): Options {
-        // Extra effort is taken below to ensure that legacy versions of options
-        // are supported below. In particular, these are:
-        //
-        // - "csharp.omnisharp" -> "omnisharp.path"
-        // - "omnisharp.XYZ" -> "dotnet.XYZ" (for options that apply to either server)
+    /** The default solution; this has been normalized to a full file path from the workspace folder it was configured in, or the string "disable" if that has been disabled */
+    readonly defaultSolution: string;
+    readonly unitTestDebuggingOptions: object;
+    readonly runSettingsPath: string;
+}
 
-        const config = vscode.workspace.getConfiguration();
+export interface OmnisharpServerOptions {
+    readonly useModernNet: boolean;
+    readonly monoPath: string;
+    readonly loggingLevel: string;
+    readonly autoStart: boolean;
+    readonly projectFilesExcludePattern: string;
+    readonly projectLoadTimeout: number;
+    readonly maxProjectResults: number;
+    readonly useEditorFormattingSettings: boolean;
+    readonly enableRoslynAnalyzers: boolean;
+    readonly enableEditorConfigSupport: boolean;
+    readonly enableDecompilationSupport: boolean;
+    readonly enableImportCompletion: boolean;
+    readonly enableAsyncCompletion: boolean;
+    readonly analyzeOpenDocumentsOnly: boolean;
+    readonly organizeImportsOnFormat: boolean;
+    readonly disableMSBuildDiagnosticWarning: boolean;
+    readonly showOmnisharpLogOnError: boolean;
+    readonly minFindSymbolsFilterLength: number;
+    readonly maxFindSymbolsItems: number;
+    readonly enableMsBuildLoadProjectsOnDemand: boolean;
+    readonly sdkPath: string;
+    readonly sdkVersion: string;
+    readonly sdkIncludePrereleases: boolean;
+    readonly dotNetCliPaths: string[];
+    readonly useFormatting: boolean;
+    readonly showReferencesCodeLens: boolean;
+    readonly showTestsCodeLens: boolean;
+    readonly filteredSymbolsCodeLens: string[];
+    readonly disableCodeActions: boolean;
+    readonly useSemanticHighlighting: boolean;
+    readonly inlayHintsEnableForParameters: boolean;
+    readonly inlayHintsForLiteralParameters: boolean;
+    readonly inlayHintsForObjectCreationParameters: boolean;
+    readonly inlayHintsForIndexerParameters: boolean;
+    readonly inlayHintsForOtherParameters: boolean;
+    readonly inlayHintsSuppressForParametersThatDifferOnlyBySuffix: boolean;
+    readonly inlayHintsSuppressForParametersThatMatchMethodIntent: boolean;
+    readonly inlayHintsSuppressForParametersThatMatchArgumentName: boolean;
+    readonly inlayHintsEnableForTypes: boolean;
+    readonly inlayHintsForImplicitVariableTypes: boolean;
+    readonly inlayHintsForLambdaParameterTypes: boolean;
+    readonly inlayHintsForImplicitObjectCreation: boolean;
+    readonly maxProjectFileCountForDiagnosticAnalysis: number;
+    readonly suppressDotnetRestoreNotification: boolean;
+    readonly enableLspDriver?: boolean | null;
+}
 
-        // Common options shared between O# and Roslyn
+export interface LanguageServerOptions {
+    readonly logLevel: string;
+    readonly documentSelector: DocumentSelector;
+    readonly extensionsPaths: string[] | null;
+    readonly preferCSharpExtension: boolean;
+    readonly startTimeout: number;
+    readonly crashDumpPath: string | undefined;
+}
 
-        // VS Code coerces unset string settings to the empty string.
-        // Thus, to avoid dealing with the empty string AND undefined,
-        // explicitly pass in the empty string as the fallback if the setting
-        // isn't defined in package.json (which should never happen).
-        const dotnetPath = Options.readOption<string>(config, 'dotnet.dotnetPath', '', 'omnisharp.dotnetPath');
-        const serverPath = Options.readOption<string>(
-            config,
-            'dotnet.server.path',
-            '',
-            'omnisharp.path',
-            'csharp.omnisharp'
-        );
-        const waitForDebugger = Options.readOption<boolean>(
-            config,
-            'dotnet.server.waitForDebugger',
-            false,
-            'omnisharp.waitForDebugger'
-        );
-        const useOmnisharpServer = Options.readOption<boolean>(config, 'dotnet.server.useOmnisharp', false);
+export interface RazorOptions {
+    readonly razorDevMode: boolean;
+    readonly razorPluginPath: string;
+}
 
-        let defaultSolution = '';
+class CommonOptionsImpl implements CommonOptions {
+    public get dotnetPath() {
+        return readOption<string>('dotnet.dotnetPath', '', 'omnisharp.dotnetPath');
+    }
+    public get waitForDebugger() {
+        return readOption<boolean>('dotnet.server.waitForDebugger', false, 'omnisharp.waitForDebugger');
+    }
+    public get serverPath() {
+        return readOption<string>('dotnet.server.path', '', 'omnisharp.path', 'csharp.omnisharp');
+    }
+    public get useOmnisharpServer() {
+        return readOption<boolean>('dotnet.server.useOmnisharp', false);
+    }
+    public get excludePaths() {
+        return getExcludedPaths();
+    }
 
-        const defaultSolutionFromWorkspace = Options.readOption<string>(
-            config,
+    /** The default solution; this has been normalized to a full file path from the workspace folder it was configured in, or the string "disable" if that has been disabled */
+    public get defaultSolution() {
+        let defaultSolution = '';
+        const defaultSolutionFromWorkspace = readOption<string>(
             'dotnet.defaultSolution',
             '',
             'omnisharp.defaultLaunchSolution'
@@ -73,7 +126,7 @@ export class Options {
                 if (defaultSolution == '') {
                     for (const workspaceFolder of vscode.workspace.workspaceFolders) {
                         const workspaceFolderConfig = vscode.workspace.getConfiguration(undefined, workspaceFolder.uri);
-                        const defaultSolutionFromWorkspaceFolder = Options.readOption<string>(
+                        const defaultSolutionFromWorkspaceFolder = readOptionFromConfig<string>(
                             workspaceFolderConfig,
                             'dotnet.defaultSolution',
                             '',
@@ -91,340 +144,302 @@ export class Options {
             }
         }
 
-        const unitTestDebuggingOptions = Options.readOption<object>(
-            config,
-            'dotnet.unitTestDebuggingOptions',
-            {},
-            'csharp.unitTestDebuggingOptions'
-        );
-
-        // Omnisharp Server Options
+        return defaultSolution;
+    }
 
-        const monoPath = Options.readOption<string>(config, 'omnisharp.monoPath', '');
+    public get unitTestDebuggingOptions() {
+        return readOption<object>('dotnet.unitTestDebuggingOptions', {}, 'csharp.unitTestDebuggingOptions');
+    }
+    public get runSettingsPath() {
+        return readOption<string>('dotnet.unitTests.runSettingsPath', '', 'omnisharp.testRunSettings');
+    }
+}
 
-        // support the legacy "verbose" level as "debug"
-        let loggingLevel = Options.readOption<string>(config, 'omnisharp.loggingLevel', 'information');
+class OmnisharpOptionsImpl implements OmnisharpServerOptions {
+    public get useModernNet() {
+        return readOption<boolean>('omnisharp.useModernNet', true);
+    }
+    public get monoPath() {
+        return readOption<string>('omnisharp.monoPath', '');
+    }
+    public get loggingLevel() {
+        let loggingLevel = readOption<string>('omnisharp.loggingLevel', 'information');
         if (loggingLevel && loggingLevel.toLowerCase() === 'verbose') {
             loggingLevel = 'debug';
         }
-
-        const useModernNet = Options.readOption<boolean>(config, 'omnisharp.useModernNet', true);
-        const sdkPath = Options.readOption<string>(config, 'omnisharp.sdkPath', '');
-        const sdkVersion = Options.readOption<string>(config, 'omnisharp.sdkVersion', '');
-        const sdkIncludePrereleases = Options.readOption<boolean>(config, 'omnisharp.sdkIncludePrereleases', true);
-        const autoStart = Options.readOption<boolean>(config, 'omnisharp.autoStart', true);
-        const projectFilesExcludePattern = Options.readOption<string>(
-            config,
+        return loggingLevel;
+    }
+    public get autoStart() {
+        return readOption<boolean>('omnisharp.autoStart', true);
+    }
+    public get projectFilesExcludePattern() {
+        return readOption<string>(
             'omnisharp.projectFilesExcludePattern',
             '**/node_modules/**,**/.git/**,**/bower_components/**'
         );
-        const projectLoadTimeout = Options.readOption<number>(config, 'omnisharp.projectLoadTimeout', 60);
-        const maxProjectResults = Options.readOption<number>(config, 'omnisharp.maxProjectResults', 250);
-        const useEditorFormattingSettings = Options.readOption<boolean>(
-            config,
-            'omnisharp.useEditorFormattingSettings',
-            true
-        );
-        const enableRoslynAnalyzersLegacyOption = Options.readOption<boolean>(
-            config,
-            'omnisharp.enableRoslynAnalyzers',
-            false
-        );
-        const diagnosticAnalysisScope = Options.readOption<string>(
-            config,
+    }
+    public get projectLoadTimeout() {
+        return readOption<number>('omnisharp.projectLoadTimeout', 60);
+    }
+    public get maxProjectResults() {
+        return readOption<number>('omnisharp.maxProjectResults', 250);
+    }
+    public get useEditorFormattingSettings() {
+        return readOption<boolean>('omnisharp.useEditorFormattingSettings', true);
+    }
+    public get enableRoslynAnalyzers() {
+        const enableRoslynAnalyzersLegacyOption = readOption<boolean>('omnisharp.enableRoslynAnalyzers', false);
+
+        const diagnosticAnalysisScope = readOption<string>(
             'dotnet.backgroundAnalysis.analyzerDiagnosticsScope',
-            useOmnisharpServer ? 'none' : 'openFiles'
+            commonOptions.useOmnisharpServer ? 'none' : 'openFiles'
         );
         const enableRoslynAnalyzersNewOption = diagnosticAnalysisScope != 'none';
-        const enableRoslynAnalyzers = enableRoslynAnalyzersLegacyOption || enableRoslynAnalyzersNewOption;
-        const enableEditorConfigSupport = Options.readOption<boolean>(
-            config,
-            'omnisharp.enableEditorConfigSupport',
-            true
-        );
-        const enableDecompilationSupport = Options.readOption<boolean>(
-            config,
-            'omnisharp.enableDecompilationSupport',
-            false
-        );
-        const enableLspDriver = Options.readOption<boolean>(config, 'omnisharp.enableLspDriver', false);
-        const enableImportCompletion = Options.readOption<boolean>(
-            config,
+        return enableRoslynAnalyzersLegacyOption || enableRoslynAnalyzersNewOption;
+    }
+    public get enableEditorConfigSupport() {
+        return readOption<boolean>('omnisharp.enableEditorConfigSupport', true);
+    }
+    public get enableDecompilationSupport() {
+        return readOption<boolean>('omnisharp.enableDecompilationSupport', false);
+    }
+    public get enableImportCompletion() {
+        return readOption<boolean>(
             'dotnet.completion.showCompletionItemsFromUnimportedNamespaces',
             false,
             'omnisharp.enableImportCompletion'
         );
-        const enableAsyncCompletion = Options.readOption<boolean>(config, 'omnisharp.enableAsyncCompletion', false);
-        const analyzeOpenDocumentsOnlyLegacyOption = Options.readOption<boolean>(
-            config,
-            'omnisharp.analyzeOpenDocumentsOnly',
-            false
+    }
+    public get enableAsyncCompletion() {
+        return readOption<boolean>('omnisharp.enableAsyncCompletion', false);
+    }
+    public get analyzeOpenDocumentsOnly() {
+        const analyzeOpenDocumentsOnlyLegacyOption = readOption<boolean>('omnisharp.analyzeOpenDocumentsOnly', false);
+
+        const diagnosticAnalysisScope = readOption<string>(
+            'dotnet.backgroundAnalysis.analyzerDiagnosticsScope',
+            commonOptions.useOmnisharpServer ? 'none' : 'openFiles'
         );
         const analyzeOpenDocumentsOnlyNewOption = diagnosticAnalysisScope == 'openFiles';
-        const analyzeOpenDocumentsOnly = analyzeOpenDocumentsOnlyLegacyOption || analyzeOpenDocumentsOnlyNewOption;
-        const organizeImportsOnFormat = Options.readOption<boolean>(config, 'omnisharp.organizeImportsOnFormat', false);
-        const disableMSBuildDiagnosticWarning = Options.readOption<boolean>(
-            config,
-            'omnisharp.disableMSBuildDiagnosticWarning',
-            false
-        );
-        const minFindSymbolsFilterLength = Options.readOption<number>(
-            config,
-            'omnisharp.minFindSymbolsFilterLength',
-            0
-        );
-        const maxFindSymbolsItems = Options.readOption<number>(config, 'omnisharp.maxFindSymbolsItems', 1000); // The limit is applied only when this setting is set to a number greater than zero
-        const enableMsBuildLoadProjectsOnDemand = Options.readOption<boolean>(
-            config,
-            'omnisharp.enableMsBuildLoadProjectsOnDemand',
-            false
-        );
-        const testRunSettings = Options.readOption<string>(config, 'omnisharp.testRunSettings', '');
-        const dotNetCliPaths = Options.readOption<string[]>(config, 'omnisharp.dotNetCliPaths', []);
-
-        const useFormatting = Options.readOption<boolean>(config, 'csharp.format.enable', true);
-        const showReferencesCodeLens = Options.readOption<boolean>(
-            config,
+        return analyzeOpenDocumentsOnlyLegacyOption || analyzeOpenDocumentsOnlyNewOption;
+    }
+    public get organizeImportsOnFormat() {
+        return readOption<boolean>('omnisharp.organizeImportsOnFormat', false);
+    }
+    public get disableMSBuildDiagnosticWarning() {
+        return readOption<boolean>('omnisharp.disableMSBuildDiagnosticWarning', false);
+    }
+    public get showOmnisharpLogOnError() {
+        return readOption<boolean>('csharp.showOmnisharpLogOnError', true);
+    }
+    public get minFindSymbolsFilterLength() {
+        return readOption<number>('omnisharp.minFindSymbolsFilterLength', 0);
+    }
+    public get maxFindSymbolsItems() {
+        return readOption<number>('omnisharp.maxFindSymbolsItems', 1000);
+    }
+    public get enableMsBuildLoadProjectsOnDemand() {
+        return readOption<boolean>('omnisharp.enableMsBuildLoadProjectsOnDemand', false);
+    }
+    public get sdkPath() {
+        return readOption<string>('omnisharp.sdkPath', '');
+    }
+    public get sdkVersion() {
+        return readOption<string>('omnisharp.sdkVersion', '');
+    }
+    public get sdkIncludePrereleases() {
+        return readOption<boolean>('omnisharp.sdkIncludePrereleases', true);
+    }
+    public get dotNetCliPaths() {
+        return readOption<string[]>('omnisharp.dotNetCliPaths', []);
+    }
+    public get useFormatting() {
+        return readOption<boolean>('csharp.format.enable', true);
+    }
+    public get showReferencesCodeLens() {
+        return readOption<boolean>(
             'dotnet.codeLens.enableReferencesCodeLens',
             true,
             'csharp.referencesCodeLens.enabled'
         );
-        const showTestsCodeLens = Options.readOption<boolean>(
-            config,
-            'dotnet.codeLens.enableTestsCodeLens',
-            true,
-            'csharp.testsCodeLens.enabled'
-        );
-        const filteredSymbolsCodeLens = Options.readOption<string[]>(
-            config,
-            'csharp.referencesCodeLens.filteredSymbols',
-            []
-        );
-        const useSemanticHighlighting = Options.readOption<boolean>(
-            config,
-            'csharp.semanticHighlighting.enabled',
-            true
-        );
-        const inlayHintsEnableForParameters = Options.readOption<boolean>(
-            config,
+    }
+    public get showTestsCodeLens() {
+        return readOption<boolean>('dotnet.codeLens.enableTestsCodeLens', true, 'csharp.testsCodeLens.enabled');
+    }
+    public get filteredSymbolsCodeLens() {
+        return readOption<string[]>('csharp.referencesCodeLens.filteredSymbols', []);
+    }
+    public get disableCodeActions() {
+        return readOption<boolean>('csharp.disableCodeActions', false);
+    }
+    public get useSemanticHighlighting() {
+        return readOption<boolean>('csharp.semanticHighlighting.enabled', true);
+    }
+    public get inlayHintsEnableForParameters() {
+        return readOption<boolean>(
             'dotnet.inlayHints.enableInlayHintsForParameters',
             false,
             'csharp.inlayHints.parameters.enabled'
         );
-        const inlayHintsForLiteralParameters = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForLiteralParameters() {
+        return readOption<boolean>(
             'dotnet.inlayHints.enableInlayHintsForLiteralParameters',
             false,
             'csharp.inlayHints.parameters.forLiteralParameters'
         );
-        const inlayHintsForObjectCreationParameters = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForObjectCreationParameters() {
+        return readOption<boolean>(
             'dotnet.inlayHints.enableInlayHintsForObjectCreationParameters',
             false,
             'csharp.inlayHints.parameters.forObjectCreationParameters'
         );
-        const inlayHintsForIndexerParameters = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForIndexerParameters() {
+        return readOption<boolean>(
             'dotnet.inlayHints.enableInlayHintsForIndexerParameters',
             false,
             'csharp.inlayHints.parameters.forIndexerParameters'
         );
-        const inlayHintsForOtherParameters = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForOtherParameters() {
+        return readOption<boolean>(
             'dotnet.inlayHints.enableInlayHintsForOtherParameters',
             false,
             'csharp.inlayHints.parameters.forOtherParameters'
         );
-        const inlayHintsSuppressForParametersThatDifferOnlyBySuffix = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsSuppressForParametersThatDifferOnlyBySuffix() {
+        return readOption<boolean>(
             'dotnet.inlayHints.suppressInlayHintsForParametersThatDifferOnlyBySuffix',
             false,
             'csharp.inlayHints.parameters.suppressForParametersThatDifferOnlyBySuffix'
         );
-        const inlayHintsSuppressForParametersThatMatchMethodIntent = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsSuppressForParametersThatMatchMethodIntent() {
+        return readOption<boolean>(
             'dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent',
             false,
             'csharp.inlayHints.parameters.suppressForParametersThatMatchMethodIntent'
         );
-        const inlayHintsSuppressForParametersThatMatchArgumentName = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsSuppressForParametersThatMatchArgumentName() {
+        return readOption<boolean>(
             'dotnet.inlayHints.suppressInlayHintsForParametersThatMatchArgumentName',
             false,
             'csharp.inlayHints.parameters.suppressForParametersThatMatchArgumentName'
         );
-        const inlayHintsEnableForTypes = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsEnableForTypes() {
+        return readOption<boolean>(
             'csharp.inlayHints.enableInlayHintsForTypes',
             false,
             'csharp.inlayHints.types.enabled'
         );
-        const inlayHintsForImplicitVariableTypes = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForImplicitVariableTypes() {
+        return readOption<boolean>(
             'csharp.inlayHints.enableInlayHintsForImplicitVariableTypes',
             false,
             'csharp.inlayHints.types.forImplicitVariableTypes'
         );
-        const inlayHintsForLambdaParameterTypes = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForLambdaParameterTypes() {
+        return readOption<boolean>(
             'csharp.inlayHints.enableInlayHintsForLambdaParameterTypes',
             false,
             'csharp.inlayHints.types.forLambdaParameterTypes'
         );
-        const inlayHintsForImplicitObjectCreation = Options.readOption<boolean>(
-            config,
+    }
+    public get inlayHintsForImplicitObjectCreation() {
+        return readOption<boolean>(
             'csharp.inlayHints.enableInlayHintsForImplicitObjectCreation',
             false,
             'csharp.inlayHints.types.forImplicitObjectCreation'
         );
-        const disableCodeActions = Options.readOption<boolean>(config, 'csharp.disableCodeActions', false);
-        const showOmnisharpLogOnError = Options.readOption<boolean>(config, 'csharp.showOmnisharpLogOnError', true);
-        const maxProjectFileCountForDiagnosticAnalysis = Options.readOption<number>(
-            config,
-            'csharp.maxProjectFileCountForDiagnosticAnalysis',
-            1000
-        );
-        const suppressDotnetRestoreNotification = Options.readOption<boolean>(
-            config,
-            'csharp.suppressDotnetRestoreNotification',
-            false
-        );
-
-        // Options for MS.CA.LanguageServer
-        const languageServerLogLevel = Options.readOption<string>(config, 'dotnet.server.trace', 'Information');
-        const documentSelector = Options.readOption<DocumentSelector>(config, 'dotnet.server.documentSelector', [
-            'csharp',
-        ]);
-        const extensionPaths = Options.readOption<string[] | null>(config, 'dotnet.server.extensionPaths', null);
-
-        // Options that apply to Razor
-        const razorDevMode = Options.readOption<boolean>(config, 'razor.devmode', false) ?? false;
-        const razorPluginPath = Options.readOption<string>(config, 'razor.plugin.path', '') ?? '';
-
-        const excludePaths = this.getExcludedPaths(vscode);
+    }
+    public get maxProjectFileCountForDiagnosticAnalysis() {
+        return readOption<number>('csharp.maxProjectFileCountForDiagnosticAnalysis', 1000);
+    }
+    public get suppressDotnetRestoreNotification() {
+        return readOption<boolean>('csharp.suppressDotnetRestoreNotification', false);
+    }
+    public get enableLspDriver() {
+        return readOption<boolean>('omnisharp.enableLspDriver', false);
+    }
+}
 
-        return new Options(
-            {
-                dotnetPath: dotnetPath,
-                waitForDebugger: waitForDebugger,
-                serverPath: serverPath,
-                useOmnisharpServer: useOmnisharpServer,
-                excludePaths: excludePaths,
-                defaultSolution: defaultSolution,
-                unitTestDebuggingOptions: unitTestDebuggingOptions,
-            },
-            {
-                useModernNet: useModernNet,
-                monoPath: monoPath,
-                loggingLevel: loggingLevel,
-                autoStart: autoStart,
-                projectFilesExcludePattern: projectFilesExcludePattern,
-                projectLoadTimeout: projectLoadTimeout,
-                maxProjectResults: maxProjectResults,
-                useEditorFormattingSettings: useEditorFormattingSettings,
-                enableRoslynAnalyzers: enableRoslynAnalyzers,
-                enableEditorConfigSupport: enableEditorConfigSupport,
-                enableDecompilationSupport: enableDecompilationSupport,
-                enableImportCompletion: enableImportCompletion,
-                enableAsyncCompletion: enableAsyncCompletion,
-                analyzeOpenDocumentsOnly: analyzeOpenDocumentsOnly,
-                organizeImportsOnFormat: organizeImportsOnFormat,
-                disableMSBuildDiagnosticWarning: disableMSBuildDiagnosticWarning,
-                showOmnisharpLogOnError: showOmnisharpLogOnError,
-                minFindSymbolsFilterLength: minFindSymbolsFilterLength,
-                maxFindSymbolsItems: maxFindSymbolsItems,
-                enableMsBuildLoadProjectsOnDemand: enableMsBuildLoadProjectsOnDemand,
-                sdkPath: sdkPath,
-                sdkVersion: sdkVersion,
-                sdkIncludePrereleases: sdkIncludePrereleases,
-                testRunSettings: testRunSettings,
-                dotNetCliPaths: dotNetCliPaths,
-                useFormatting: useFormatting,
-                showReferencesCodeLens: showReferencesCodeLens,
-                showTestsCodeLens: showTestsCodeLens,
-                filteredSymbolsCodeLens: filteredSymbolsCodeLens,
-                disableCodeActions: disableCodeActions,
-                useSemanticHighlighting: useSemanticHighlighting,
-                inlayHintsEnableForParameters: inlayHintsEnableForParameters,
-                inlayHintsForLiteralParameters: inlayHintsForLiteralParameters,
-                inlayHintsForObjectCreationParameters: inlayHintsForObjectCreationParameters,
-                inlayHintsForIndexerParameters: inlayHintsForIndexerParameters,
-                inlayHintsForOtherParameters: inlayHintsForOtherParameters,
-                inlayHintsSuppressForParametersThatDifferOnlyBySuffix:
-                    inlayHintsSuppressForParametersThatDifferOnlyBySuffix,
-                inlayHintsSuppressForParametersThatMatchMethodIntent:
-                    inlayHintsSuppressForParametersThatMatchMethodIntent,
-                inlayHintsSuppressForParametersThatMatchArgumentName:
-                    inlayHintsSuppressForParametersThatMatchArgumentName,
-                inlayHintsEnableForTypes: inlayHintsEnableForTypes,
-                inlayHintsForImplicitVariableTypes: inlayHintsForImplicitVariableTypes,
-                inlayHintsForLambdaParameterTypes: inlayHintsForLambdaParameterTypes,
-                inlayHintsForImplicitObjectCreation: inlayHintsForImplicitObjectCreation,
-                maxProjectFileCountForDiagnosticAnalysis: maxProjectFileCountForDiagnosticAnalysis,
-                suppressDotnetRestoreNotification: suppressDotnetRestoreNotification,
-                enableLspDriver: enableLspDriver,
-            },
-            {
-                logLevel: languageServerLogLevel,
-                documentSelector: documentSelector,
-                extensionsPaths: extensionPaths,
-            },
-            {
-                razorDevMode: razorDevMode,
-                razorPluginPath: razorPluginPath,
-            }
-        );
+class LanguageServerOptionsImpl implements LanguageServerOptions {
+    public get logLevel() {
+        return readOption<string>('dotnet.server.trace', 'Information');
+    }
+    public get documentSelector() {
+        return readOption<DocumentSelector>('dotnet.server.documentSelector', ['csharp']);
+    }
+    public get extensionsPaths() {
+        return readOption<string[] | null>('dotnet.server.extensionPaths', null);
+    }
+    public get preferCSharpExtension() {
+        return readOption<boolean>('dotnet.preferCSharpExtension', false);
+    }
+    public get startTimeout() {
+        return readOption<number>('dotnet.server.startTimeout', 30000);
+    }
+    public get crashDumpPath() {
+        return readOption<string | undefined>('dotnet.server.crashDumpPath', undefined);
     }
+}
 
-    public static getExcludedPaths(vscode: vscode, includeSearchExcludes = false): string[] {
-        const workspaceConfig = vscode.workspace.getConfiguration();
+class RazorOptionsImpl implements RazorOptions {
+    public get razorDevMode() {
+        return readOption<boolean>('razor.devmode', false);
+    }
+    public get razorPluginPath() {
+        return readOption<string>('razor.plugin.path', '');
+    }
+}
 
-        let excludePaths = getExcludes(workspaceConfig, 'files.exclude');
+export const commonOptions: CommonOptions = new CommonOptionsImpl();
+export const omnisharpOptions: OmnisharpServerOptions = new OmnisharpOptionsImpl();
+export const languageServerOptions: LanguageServerOptions = new LanguageServerOptionsImpl();
+export const razorOptions: RazorOptions = new RazorOptionsImpl();
 
-        if (includeSearchExcludes) {
-            excludePaths = excludePaths.concat(getExcludes(workspaceConfig, 'search.exclude'));
-        }
+function getExcludedPaths(): string[] {
+    const workspaceConfig = vscode.workspace.getConfiguration();
 
-        return excludePaths;
+    const excludePaths = getExcludes(workspaceConfig, 'files.exclude');
+    return excludePaths;
 
-        function getExcludes(config: WorkspaceConfiguration, option: string): string[] {
-            const optionValue = config.get<{ [i: string]: boolean }>(option, {});
-            return Object.entries(optionValue)
-                .filter(([_, value]) => value)
-                .map(([key, _]) => key);
-        }
+    function getExcludes(config: vscode.WorkspaceConfiguration, option: string): string[] {
+        const optionValue = config.get<{ [i: string]: boolean }>(option, {});
+        return Object.entries(optionValue)
+            .filter(([_, value]) => value)
+            .map(([key, _]) => key);
     }
+}
 
-    /**
-     * Reads an option from the vscode config with an optional back compat parameter.
-     */
-    private static readOption<T>(
-        config: WorkspaceConfiguration,
-        option: string,
-        defaultValue: T,
-        ...backCompatOptionNames: string[]
-    ): T {
-        let value = config.get<T>(option);
-
-        if (value === undefined && backCompatOptionNames.length > 0) {
-            // Search the back compat options for a defined value.
-            value = backCompatOptionNames.map((name) => config.get<T>(name)).find((val) => val);
-        }
-
-        return value ?? defaultValue;
+/**
+ * Reads an option from the vscode config with an optional back compat parameter.
+ */
+function readOptionFromConfig<T>(
+    config: vscode.WorkspaceConfiguration,
+    option: string,
+    defaultValue: T,
+    ...backCompatOptionNames: string[]
+): T {
+    let value = config.get<T>(option);
+
+    if (value === undefined && backCompatOptionNames.length > 0) {
+        // Search the back compat options for a defined value.
+        value = backCompatOptionNames.map((name) => config.get<T>(name)).find((val) => val);
     }
-}
 
-export interface CommonOptions {
-    dotnetPath: string;
-    waitForDebugger: boolean;
-    serverPath: string;
-    useOmnisharpServer: boolean;
-    excludePaths: string[];
+    return value ?? defaultValue;
+}
 
-    /** The default solution; this has been normalized to a full file path from the workspace folder it was configured in, or the string "disable" if that has been disabled */
-    defaultSolution: string;
-    unitTestDebuggingOptions: object;
+function readOption<T>(option: string, defaultValue: T, ...backCompatOptionNames: string[]): T {
+    return readOptionFromConfig(vscode.workspace.getConfiguration(), option, defaultValue, ...backCompatOptionNames);
 }
 
 export const CommonOptionsThatTriggerReload: ReadonlyArray<keyof CommonOptions> = [
@@ -434,55 +449,6 @@ export const CommonOptionsThatTriggerReload: ReadonlyArray<keyof CommonOptions>
     'useOmnisharpServer',
 ];
 
-export interface OmnisharpServerOptions {
-    useModernNet: boolean;
-    monoPath: string;
-    loggingLevel: string;
-    autoStart: boolean;
-    projectFilesExcludePattern: string;
-    projectLoadTimeout: number;
-    maxProjectResults: number;
-    useEditorFormattingSettings: boolean;
-    enableRoslynAnalyzers: boolean;
-    enableEditorConfigSupport: boolean;
-    enableDecompilationSupport: boolean;
-    enableImportCompletion: boolean;
-    enableAsyncCompletion: boolean;
-    analyzeOpenDocumentsOnly: boolean;
-    organizeImportsOnFormat: boolean;
-    disableMSBuildDiagnosticWarning: boolean;
-    showOmnisharpLogOnError: boolean;
-    minFindSymbolsFilterLength: number;
-    maxFindSymbolsItems: number;
-    enableMsBuildLoadProjectsOnDemand: boolean;
-    sdkPath: string;
-    sdkVersion: string;
-    sdkIncludePrereleases: boolean;
-    testRunSettings: string;
-    dotNetCliPaths: string[];
-    useFormatting: boolean;
-    showReferencesCodeLens: boolean;
-    showTestsCodeLens: boolean;
-    filteredSymbolsCodeLens: string[];
-    disableCodeActions: boolean;
-    useSemanticHighlighting: boolean;
-    inlayHintsEnableForParameters: boolean;
-    inlayHintsForLiteralParameters: boolean;
-    inlayHintsForObjectCreationParameters: boolean;
-    inlayHintsForIndexerParameters: boolean;
-    inlayHintsForOtherParameters: boolean;
-    inlayHintsSuppressForParametersThatDifferOnlyBySuffix: boolean;
-    inlayHintsSuppressForParametersThatMatchMethodIntent: boolean;
-    inlayHintsSuppressForParametersThatMatchArgumentName: boolean;
-    inlayHintsEnableForTypes: boolean;
-    inlayHintsForImplicitVariableTypes: boolean;
-    inlayHintsForLambdaParameterTypes: boolean;
-    inlayHintsForImplicitObjectCreation: boolean;
-    maxProjectFileCountForDiagnosticAnalysis: number;
-    suppressDotnetRestoreNotification: boolean;
-    enableLspDriver?: boolean | null;
-}
-
 export const OmnisharpOptionsThatTriggerReload: ReadonlyArray<keyof OmnisharpServerOptions> = [
     'enableMsBuildLoadProjectsOnDemand',
     'loggingLevel',
@@ -512,18 +478,8 @@ export const OmnisharpOptionsThatTriggerReload: ReadonlyArray<keyof OmnisharpSer
     'inlayHintsForImplicitObjectCreation',
 ];
 
-export interface RazorOptions {
-    razorDevMode: boolean;
-    razorPluginPath: string;
-}
-
-export interface LanguageServerOptions {
-    logLevel: string;
-    documentSelector: DocumentSelector;
-    extensionsPaths: string[] | null;
-}
-
 export const LanguageServerOptionsThatTriggerReload: ReadonlyArray<keyof LanguageServerOptions> = [
     'logLevel',
     'documentSelector',
+    'preferCSharpExtension',
 ];
diff --git a/src/shared/projectConfiguration.ts b/src/shared/projectConfiguration.ts
index 8e5bb0133..72e7e0d2b 100644
--- a/src/shared/projectConfiguration.ts
+++ b/src/shared/projectConfiguration.ts
@@ -6,7 +6,7 @@
 import * as crypto from 'crypto';
 import { machineIdSync } from 'node-machine-id';
 import { PlatformInformation } from './platform';
-import { ITelemetryReporter, getTelemetryProps } from './telemetryReporter';
+import { getTelemetryProps } from './telemetryReporter';
 import { DotnetInfo } from './utils/dotnetInfo';
 
 export interface ProjectConfigurationMessage {
@@ -22,7 +22,6 @@ export interface ProjectConfigurationMessage {
 }
 
 export function reportProjectConfigurationEvent(
-    reporter: ITelemetryReporter,
     projectConfig: ProjectConfigurationMessage,
     platformInfo: PlatformInformation,
     dotnetInfo: DotnetInfo | undefined,
@@ -50,8 +49,6 @@ export function reportProjectConfigurationEvent(
     if (useModernNet) {
         telemetryProps['useModernNet'] = useModernNet.toString();
     }
-
-    reporter.sendTelemetryEvent('ProjectConfiguration', telemetryProps);
 }
 
 function createSolutionId(solutionPath: string) {
diff --git a/src/shared/reportIssue.ts b/src/shared/reportIssue.ts
index 4bcac913f..58349c5ff 100644
--- a/src/shared/reportIssue.ts
+++ b/src/shared/reportIssue.ts
@@ -3,26 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Extension, vscode } from '../vscodeAdapter';
-import { Options } from '../shared/options';
+import * as vscode from 'vscode';
 import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
 import { basename, dirname } from 'path';
 import { DotnetInfo } from './utils/dotnetInfo';
 import { CSharpExtensionId } from '../constants/csharpExtensionId';
+import { commonOptions } from './options';
 
 export default async function reportIssue(
-    vscode: vscode,
     csharpExtVersion: string,
     getDotnetInfo: (dotNetCliPaths: string[]) => Promise<DotnetInfo>,
     shouldIncludeMonoInfo: boolean,
-    options: Options,
     dotnetResolver: IHostExecutableResolver,
     monoResolver?: IHostExecutableResolver
 ) {
     // Get info for the dotnet that the language server executable is run on, not the dotnet the language server will execute user code on.
     let fullDotnetInfo: string | undefined;
     try {
-        const info = await dotnetResolver.getHostExecutableInfo(options);
+        const info = await dotnetResolver.getHostExecutableInfo();
         const dotnetInfo = await getDotnetInfo([dirname(info.path)]);
         fullDotnetInfo = dotnetInfo.FullInfo;
     } catch (error) {
@@ -32,12 +30,12 @@ export default async function reportIssue(
 
     let monoInfo = '';
     if (shouldIncludeMonoInfo && monoResolver) {
-        monoInfo = await getMonoIfPlatformValid(options, monoResolver);
+        monoInfo = await getMonoIfPlatformValid(monoResolver);
     }
 
-    const extensions = getInstalledExtensions(vscode);
+    const extensions = getInstalledExtensions();
 
-    const useOmnisharp = options.commonOptions.useOmnisharpServer;
+    const useOmnisharp = commonOptions.useOmnisharpServer;
     const logInfo = getLogInfo(useOmnisharp);
 
     const body = `## Issue Description ##
@@ -71,7 +69,7 @@ ${generateExtensionTable(extensions)}
     });
 }
 
-function sortExtensions(a: Extension<any>, b: Extension<any>): number {
+function sortExtensions(a: vscode.Extension<any>, b: vscode.Extension<any>): number {
     if (a.packageJSON.name.toLowerCase() < b.packageJSON.name.toLowerCase()) {
         return -1;
     }
@@ -81,7 +79,7 @@ function sortExtensions(a: Extension<any>, b: Extension<any>): number {
     return 0;
 }
 
-function generateExtensionTable(extensions: Extension<any>[]) {
+function generateExtensionTable(extensions: vscode.Extension<any>[]) {
     if (extensions.length <= 0) {
         return 'none';
     }
@@ -103,10 +101,10 @@ ${tableHeader}\n${table};
     return extensionTable;
 }
 
-async function getMonoIfPlatformValid(options: Options, monoResolver: IHostExecutableResolver): Promise<string> {
+async function getMonoIfPlatformValid(monoResolver: IHostExecutableResolver): Promise<string> {
     let monoVersion = 'Unknown Mono version';
     try {
-        const monoInfo = await monoResolver.getHostExecutableInfo(options);
+        const monoInfo = await monoResolver.getHostExecutableInfo();
         monoVersion = `OmniSharp using mono: ${monoInfo.version}`;
     } catch (error) {
         monoVersion = error instanceof Error ? error.message : `${error}`;
@@ -138,7 +136,7 @@ Additionally, if you can reproduce the issue reliably, set the value of the \`do
     }
 }
 
-function getInstalledExtensions(vscode: vscode) {
+function getInstalledExtensions() {
     const extensions = vscode.extensions.all.filter((extension) => extension.packageJSON.isBuiltin === false);
 
     return extensions.sort(sortExtensions);
diff --git a/src/shared/utils/dotnetInfo.ts b/src/shared/utils/dotnetInfo.ts
index adab08b1f..7b354325f 100644
--- a/src/shared/utils/dotnetInfo.ts
+++ b/src/shared/utils/dotnetInfo.ts
@@ -5,7 +5,7 @@
 
 import * as semver from 'semver';
 
-type RuntimeVersionMap = { [runtime: string]: semver.SemVer[] };
+type RuntimeVersionMap = { [runtime: string]: RuntimeInfo[] };
 export interface DotnetInfo {
     CliPath?: string;
     FullInfo: string;
@@ -15,3 +15,8 @@ export interface DotnetInfo {
     Architecture?: string;
     Runtimes: RuntimeVersionMap;
 }
+
+export interface RuntimeInfo {
+    Version: semver.SemVer;
+    Path: string;
+}
diff --git a/src/shared/utils/getDotnetInfo.ts b/src/shared/utils/getDotnetInfo.ts
index 1ecc0fce0..72bbc2cde 100644
--- a/src/shared/utils/getDotnetInfo.ts
+++ b/src/shared/utils/getDotnetInfo.ts
@@ -7,7 +7,7 @@ import * as semver from 'semver';
 import { join } from 'path';
 import { execChildProcess } from '../../common';
 import { CoreClrDebugUtil } from '../../coreclrDebug/util';
-import { DotnetInfo } from './dotnetInfo';
+import { DotnetInfo, RuntimeInfo } from './dotnetInfo';
 import { EOL } from 'os';
 
 // This function calls `dotnet --info` and returns the result as a DotnetInfo object.
@@ -39,7 +39,8 @@ async function runDotnetInfo(dotnetExecutablePath: string | undefined): Promise<
             ...process.env,
             DOTNET_CLI_UI_LANGUAGE: 'en-US',
         };
-        const data = await execChildProcess(`${dotnetExecutablePath ?? 'dotnet'} --info`, process.cwd(), env);
+        const command = dotnetExecutablePath ? `"${dotnetExecutablePath}"` : 'dotnet';
+        const data = await execChildProcess(`${command} --info`, process.cwd(), env);
         return data;
     } catch (error) {
         const message = error instanceof Error ? error.message : `${error}`;
@@ -68,7 +69,7 @@ async function parseDotnetInfo(dotnetInfo: string, dotnetExecutablePath: string
             }
         }
 
-        const runtimeVersions: { [runtime: string]: semver.SemVer[] } = {};
+        const runtimeVersions: { [runtime: string]: RuntimeInfo[] } = {};
         const listRuntimes = await execChildProcess('dotnet --list-runtimes', process.cwd(), process.env);
         lines = listRuntimes.split(/\r?\n/);
         for (const line of lines) {
@@ -77,9 +78,17 @@ async function parseDotnetInfo(dotnetInfo: string, dotnetExecutablePath: string
                 const runtime = match[1];
                 const runtimeVersion = match[2];
                 if (runtime in runtimeVersions) {
-                    runtimeVersions[runtime].push(semver.parse(runtimeVersion)!);
+                    runtimeVersions[runtime].push({
+                        Version: semver.parse(runtimeVersion)!,
+                        Path: match[3],
+                    });
                 } else {
-                    runtimeVersions[runtime] = [semver.parse(runtimeVersion)!];
+                    runtimeVersions[runtime] = [
+                        {
+                            Version: semver.parse(runtimeVersion)!,
+                            Path: match[3],
+                        },
+                    ];
                 }
             }
         }
diff --git a/src/shared/workspaceConfigurationProvider.ts b/src/shared/workspaceConfigurationProvider.ts
index 2e2c9bb20..f13ebbddb 100644
--- a/src/shared/workspaceConfigurationProvider.ts
+++ b/src/shared/workspaceConfigurationProvider.ts
@@ -18,7 +18,6 @@ import { parse } from 'jsonc-parser';
 import { IWorkspaceDebugInformationProvider } from './IWorkspaceDebugInformationProvider';
 import { PlatformInformation } from './platform';
 import { BaseVsDbgConfigurationProvider } from './configurationProvider';
-import OptionProvider from './observers/optionProvider';
 
 /**
  * This class will be used for providing debug configurations given workspace information.
@@ -27,10 +26,9 @@ export class DotnetWorkspaceConfigurationProvider extends BaseVsDbgConfiguration
     public constructor(
         private workspaceDebugInfoProvider: IWorkspaceDebugInformationProvider,
         platformInformation: PlatformInformation,
-        optionProvider: OptionProvider,
         csharpOutputChannel: vscode.OutputChannel
     ) {
-        super(platformInformation, optionProvider, csharpOutputChannel);
+        super(platformInformation, csharpOutputChannel);
     }
 
     /**
diff --git a/src/tools/OptionsSchema.json b/src/tools/OptionsSchema.json
index d28e9ffe8..552343e46 100644
--- a/src/tools/OptionsSchema.json
+++ b/src/tools/OptionsSchema.json
@@ -141,6 +141,57 @@
         }
       }
     },
+    "DiagnosticsLog": {
+      "type": "object",
+      "required": [],
+      "default": {},
+      "description": "Settings to control which messages are printed to the output window from the debugger's diagnostics log. This log is meant to help troubleshoot problems with the debugger.",
+      "properties": {
+        "protocolMessages": {
+          "type": "boolean",
+          "markdownDescription": "Flag to determine whether DAP protocol messages exchanged between the C# debugger and the UI should be logged to the output window. This option defaults to `false`.",
+          "default": false
+        },
+        "dispatcherMessages": {
+          "type": "string",
+          "enum": [ "none", "error", "important", "normal" ],
+          "enumDescriptions": [
+            "Do not print additional diagnostic messages.",
+            "Print error-level diagnostic messages.",
+            "Print important diagnostic messages.",
+            "Print all non-verbose diagnostic messages."
+          ],
+          "markdownDescription": "Controls which messages are printed to the output window from the debugger's dispatcher. If not specified, this will default to `none` unless one of the verbose log settings are enabled (`debugEngineAPITracing`, `debugRuntimeEventTracing`, `expressionEvaluationTracing` or `startDebuggingTracing`), in which case the default changes to `normal`.",
+          "default": "none"
+        },
+        "debugEngineAPITracing": {
+          "type": "string",
+          "enum": [ "none", "error", "all" ],
+          "enumDescriptions": [
+            "Disable tracing API calls",
+            "Print failures from debugger API calls.",
+            "Print all debugger API calls. This is very verbose."
+          ],
+          "markdownDescription": "Controls if API calls to Microsoft.VisualStudio.Debugger.Engine/vsdebugeng.h should be printed to the output window. This option defaults to `none`.",
+          "default": "none"
+        },
+        "debugRuntimeEventTracing": {
+          "type": "boolean",
+          "markdownDescription": "Flag to determine whether verbose tracing for events raised by the underlying runtime should be enabled. This option defaults to `false`.",
+          "default": false
+        },
+        "expressionEvaluationTracing": {
+          "type": "boolean",
+          "markdownDescription": "Flag to determine whether verbose tracing for expression evaluation should be enabled. This option defaults to `false`.",
+          "default": false
+        },
+        "startDebuggingTracing": {
+          "type": "boolean",
+          "markdownDescription": "Flag to determine whether verbose tracing for start debugging should be enabled. This option defaults to `false`.",
+          "default": false
+        }
+      }
+    },
     "Logging": {
       "type": "object",
       "required": [],
@@ -162,11 +213,6 @@
           "markdownDescription": "Flag to determine whether program output should be logged to the output window when not using an external console. This option defaults to `true`.",
           "default": true
         },
-        "engineLogging": {
-          "type": "boolean",
-          "markdownDescription": "Flag to determine whether diagnostic engine logs should be logged to the output window. This option defaults to `false`.",
-          "default": false
-        },
         "browserStdOut": {
           "type": "boolean",
           "markdownDescription": "Flag to determine if stdout text from the launching the web browser should be logged to the output window. This option defaults to `true`.",
@@ -174,7 +220,7 @@
         },
         "elapsedTiming": {
           "type": "boolean",
-          "markdownDescription": "If true, engine logging will include `adapterElapsedTime` and `engineElapsedTime` properties to indicate the amount of time, in microseconds, that a request took. This option defaults to `false`.",
+          "markdownDescription": "If true, protocol message logging will include `adapterElapsedTime` and `engineElapsedTime` properties to indicate the amount of time, in microseconds, that a request took. This option defaults to `false`.",
           "default": false
         },
         "threadExit": {
@@ -186,6 +232,15 @@
           "type": "boolean",
           "markdownDescription": "Controls if a message is logged when the target process exits, or debugging is stopped. This option defaults to `true`.",
           "default": true
+        },
+        "engineLogging": {
+          "type": "boolean",
+          "deprecationMessage": "The setting 'logging.engineLogging' has been deprecated in favor of 'logging.diagnosticsLog.protocolMessages'.",
+          "default": false
+        },
+        "diagnosticsLog": {
+          "$ref": "#/definitions/DiagnosticsLog",
+          "description": "Settings to control which messages are printed to the output window from the debugger's diagnostics log. This log is meant to help troubleshoot problems with the debugger."
         }
       }
     },
diff --git a/src/tools/generateOptionsSchema.ts b/src/tools/generateOptionsSchema.ts
index ca143e626..e81cd800a 100644
--- a/src/tools/generateOptionsSchema.ts
+++ b/src/tools/generateOptionsSchema.ts
@@ -159,9 +159,31 @@ function generateCommentArrayForDescription(description: string): string[] {
 
     // If the description contains '\u200b', it is used to prevent vscode from rendering a URL.
     if (description.includes('\u200b')) {
+        const urlRegEx = new RegExp('https?\\u200b:[\\w/\\.\u200b]+', 'g');
+        let result = urlRegEx.exec(description);
+        if (!result) {
+            throw `Found zero-with unicode space outside of expected URL in '${description}'`;
+        }
+
         comments.push(
             "We use '\u200b' (unicode zero-length space character) to break VS Code's URL detection regex for URLs that are examples. Please do not translate or localized the URL."
         );
+        while (result !== null) {
+            let foundText = result[0];
+
+            // check if the match is surrounded by `()`, and if so, include them
+            if (
+                result.index > 0 &&
+                result.index + foundText.length < description.length &&
+                description[result.index - 1] === '(' &&
+                description[result.index + foundText.length] === ')'
+            ) {
+                foundText = `(${foundText})`;
+            }
+
+            comments.push(`{Locked='${foundText}'}`);
+            result = urlRegEx.exec(description);
+        }
     }
 
     return comments;
@@ -176,7 +198,7 @@ function generateLocForProperty(key: string, prop: any, keyToLocString: any): vo
             if (comments.length > 0) {
                 keyToLocString[descriptionKey] = {
                     message: prop.description,
-                    comments: comments,
+                    comment: comments,
                 };
             } else {
                 keyToLocString[descriptionKey] = prop.description;
@@ -192,7 +214,7 @@ function generateLocForProperty(key: string, prop: any, keyToLocString: any): vo
             if (comments.length > 0) {
                 keyToLocString[markdownDescriptionKey] = {
                     message: prop.markdownDescription,
-                    comments: comments,
+                    comment: comments,
                 };
             } else {
                 keyToLocString[markdownDescriptionKey] = prop.markdownDescription;
@@ -208,7 +230,7 @@ function generateLocForProperty(key: string, prop: any, keyToLocString: any): vo
             if (comments.length > 0) {
                 keyToLocString[settingsDescriptionKey] = {
                     message: prop.settingsDescription,
-                    comments: comments,
+                    comment: comments,
                 };
             } else {
                 keyToLocString[settingsDescriptionKey] = prop.settingsDescription;
@@ -217,6 +239,22 @@ function generateLocForProperty(key: string, prop: any, keyToLocString: any): vo
         prop.settingsDescription = `%${settingsDescriptionKey}%`;
     }
 
+    if (prop.deprecationMessage) {
+        const descriptionKey = `${key}.deprecationMessage`;
+        if (!keyToLocString[descriptionKey]) {
+            const comments: string[] = generateCommentArrayForDescription(prop.deprecationMessage);
+            if (comments.length > 0) {
+                keyToLocString[descriptionKey] = {
+                    message: prop.deprecationMessage,
+                    comment: comments,
+                };
+            } else {
+                keyToLocString[descriptionKey] = prop.deprecationMessage;
+            }
+        }
+        prop.deprecationMessage = `%${descriptionKey}%`;
+    }
+
     if (prop.enum && prop.enumDescriptions) {
         for (let i = 0; i < prop.enum.length; i++) {
             const enumName = prop.enum[i];
@@ -325,6 +363,19 @@ export function GenerateOptionsSchema() {
     delete unitTestDebuggingOptions.processName;
     delete unitTestDebuggingOptions.processId;
     delete unitTestDebuggingOptions.pipeTransport;
+
+    // Remove diagnostic log logging options -- these should be set using the global option
+    const allowedLoggingOptions = ['exceptions', 'moduleLoad', 'programOutput', 'threadExit', 'processExit'];
+    const diagnosticLogOptions = Object.keys(unitTestDebuggingOptions.logging.properties).filter((x) => {
+        if (allowedLoggingOptions.indexOf(x) >= 0) {
+            return false;
+        }
+        return true;
+    });
+    for (const key of diagnosticLogOptions) {
+        delete unitTestDebuggingOptions.logging.properties[key];
+    }
+
     // Add the additional options we do want
     unitTestDebuggingOptions['type'] = {
         type: 'string',
diff --git a/src/tools/updatePackageDependencies.ts b/src/tools/updatePackageDependencies.ts
index 934c6b438..632fdd16b 100644
--- a/src/tools/updatePackageDependencies.ts
+++ b/src/tools/updatePackageDependencies.ts
@@ -258,7 +258,7 @@ function getLowercaseFileNameFromUrl(url: string): string {
     } else if (fileName.startsWith('coreclr-debug')) {
         // Debugger versions are not contained in the file name.
         return fileName;
-    } else if (fileName.startsWith('razorlanguageserver')) {
+    } else if (fileName.startsWith('razorlanguageserver') || fileName.startsWith('devkittelemetry')) {
         // Razor versions are everything after the second to last dash.
         // e.g. we want razorlanguageserver-win-x64 from razorlanguageserver-win-x64-7.0.0-preview.23067.5.zip
         const secondToLastDash = fileName.lastIndexOf('-', fileName.lastIndexOf('-') - 1);
diff --git a/src/utils/getCSharpDevKit.ts b/src/utils/getCSharpDevKit.ts
index 4f5ee38cc..fcbcbd9e9 100644
--- a/src/utils/getCSharpDevKit.ts
+++ b/src/utils/getCSharpDevKit.ts
@@ -5,10 +5,16 @@
 
 import * as vscode from 'vscode';
 import { CSharpDevKitExports } from '../csharpDevKitExports';
+import { languageServerOptions } from '../shared/options';
 
 export const csharpDevkitExtensionId = 'ms-dotnettools.csdevkit';
 export const csharpDevkitIntelliCodeExtensionId = 'ms-dotnettools.vscodeintellicode-csharp';
 
 export function getCSharpDevKit(): vscode.Extension<CSharpDevKitExports> | undefined {
+    // Devkit is explicitly disabled via the option - we should ignore it even if it exists.
+    if (languageServerOptions.preferCSharpExtension) {
+        return undefined;
+    }
+
     return vscode.extensions.getExtension<CSharpDevKitExports>(csharpDevkitExtensionId);
 }
diff --git a/tasks/createTagsTasks.ts b/tasks/createTagsTasks.ts
index 4f1ad069d..df501d258 100644
--- a/tasks/createTagsTasks.ts
+++ b/tasks/createTagsTasks.ts
@@ -11,13 +11,16 @@ import { Octokit } from '@octokit/rest';
 interface Options {
     releaseVersion: string;
     releaseCommit: string;
-    dryRun: boolean;
+    // Even it is specified as boolean, it would still be parsed as string in compiled js.
+    dryRun: string;
 }
 
 gulp.task('createTags', async (): Promise<void> => {
     const options = minimist<Options>(process.argv.slice(2));
     console.log(`releaseVersion: ${options.releaseVersion}`);
     console.log(`releaseCommit: ${options.releaseCommit}`);
+    const dryRun = options.dryRun.toLocaleLowerCase() === 'true';
+    console.log(`dry run: ${dryRun}`);
 
     const roslynCommit = await findRoslynCommitAsync();
     if (!roslynCommit) {
@@ -25,7 +28,8 @@ gulp.task('createTags', async (): Promise<void> => {
         return;
     }
 
-    if (options.dryRun) {
+    // The compiled option value in js type is 'any' type.
+    if (dryRun) {
         console.log('Tagging is skipped in dry run mode.');
         return;
     } else {
@@ -48,7 +52,7 @@ gulp.task('createTags', async (): Promise<void> => {
             'dotnet',
             'vscode-csharp',
             options.releaseCommit,
-            options.releaseVersion,
+            `v${options.releaseVersion}`,
             options.releaseVersion
         );
 
@@ -74,7 +78,7 @@ async function findRoslynCommitAsync(): Promise<string | null> {
     // Nuget package should exist under out/.nuget/ since we have run the install dependencies task.
     const nuspecFile = fs
         .readFileSync(
-            `out/.nuget/microsoft.codeanalysis.languageserver/${roslynVersion}/microsoft.codeanalysis.languageserver.nuspec`
+            `out/.nuget/microsoft.codeanalysis.languageserver.linux-x64/${roslynVersion}/microsoft.codeanalysis.languageserver.linux-x64.nuspec`
         )
         .toString();
     const results = /commit="(.*)"/.exec(nuspecFile);
diff --git a/tasks/debuggerTasks.ts b/tasks/debuggerTasks.ts
new file mode 100644
index 000000000..a4e09a508
--- /dev/null
+++ b/tasks/debuggerTasks.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as gulp from 'gulp';
+import * as fs from 'fs';
+import * as os from 'os';
+
+import * as optionsSchemaGenerator from '../src/tools/generateOptionsSchema';
+import * as packageDependencyUpdater from '../src/tools/updatePackageDependencies';
+
+// Disable warning about wanting an async function
+// tslint:disable-next-line
+gulp.task('generateOptionsSchema', async (): Promise<void> => {
+    optionsSchemaGenerator.GenerateOptionsSchema();
+    return Promise.resolve();
+});
+
+// Disable warning about wanting an async function
+// tslint:disable-next-line
+gulp.task('updatePackageDependencies', async (): Promise<void> => {
+    return packageDependencyUpdater.updatePackageDependencies();
+});
+
+// Disable warning about wanting an async function
+// tslint:disable-next-line
+gulp.task('fixLocURLs', async (): Promise<void> => {
+    const langCodes = ['cs', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'pl', 'pt-br', 'ru', 'tr', 'zh-cn', 'zh-tw'];
+    const keysWithURLExamples = [
+        'generateOptionsSchema.symbolOptions.searchPaths.description',
+        'generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description',
+        'generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description',
+    ];
+
+    langCodes.forEach((lang) => {
+        const filename = `package.nls.${lang}.json`;
+        const packageNLSJson = JSON.parse(fs.readFileSync(filename).toString());
+
+        for (const key of keysWithURLExamples) {
+            if (!packageNLSJson[key].toString().includes('\u200b')) {
+                // Look for instances of http[s] with our without the hidden zero-width symbol and add it.
+                packageNLSJson[key] = packageNLSJson[key].replace(/http(s?)\u200b?:\/\//, `http$1:\u200b://`);
+                // Find the instances of /download/symbols and inject a hidden zero-width symbol.
+                packageNLSJson[key] = packageNLSJson[key].replace(
+                    /\u200b?\/download\/symbols/,
+                    `\u200b/download/symbols`
+                );
+            }
+        }
+
+        let content = JSON.stringify(packageNLSJson, null, 2);
+        if (os.platform() === 'win32') {
+            content = content.replace(/\n/gm, '\r\n');
+        }
+        content = content.replace(/\u200b/gm, '\\u200b');
+
+        fs.writeFileSync(filename, content);
+    });
+});
diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts
index d109571a5..a09ff064c 100644
--- a/tasks/offlinePackagingTasks.ts
+++ b/tasks/offlinePackagingTasks.ts
@@ -80,22 +80,25 @@ gulp.task('installDependencies', async () => {
     }
 });
 
+gulp.task(
+    'updateRoslynVersion',
+    // Run the fetch of all packages, and then also installDependencies after
+    gulp.series(async () => {
+        const packageJSON = getPackageJSON();
+
+        // Fetch the neutral package that we don't otherwise have in our platform list
+        await acquireRoslyn(packageJSON, undefined, true);
+
+        // And now fetch each platform specific
+        for (const p of platformSpecificPackages) {
+            await acquireRoslyn(packageJSON, p.platformInfo, true);
+        }
+    }, 'installDependencies')
+);
+
 // Install Tasks
 async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformation) {
-    const roslynVersion = packageJSON.defaults.roslyn;
-    const packagePath = await acquireNugetPackage('Microsoft.CodeAnalysis.LanguageServer', roslynVersion);
-
-    // Find the matching server RID for the current platform.
-    let serverPlatform: string;
-    if (platformInfo === undefined) {
-        serverPlatform = 'neutral';
-    } else {
-        serverPlatform = platformSpecificPackages.find(
-            (p) =>
-                p.platformInfo.platform === platformInfo.platform &&
-                p.platformInfo.architecture === platformInfo.architecture
-        )!.rid;
-    }
+    const { packagePath, serverPlatform } = await acquireRoslyn(packageJSON, platformInfo, false);
 
     // Get the directory containing the server executable for the current platform.
     const serverExecutableDirectory = path.join(packagePath, 'content', 'LanguageServer', serverPlatform);
@@ -114,6 +117,33 @@ async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformatio
     }
 }
 
+async function acquireRoslyn(
+    packageJSON: any,
+    platformInfo: PlatformInformation | undefined,
+    interactive: boolean
+): Promise<{ packagePath: string; serverPlatform: string }> {
+    const roslynVersion = packageJSON.defaults.roslyn;
+
+    // Find the matching server RID for the current platform.
+    let serverPlatform: string;
+    if (platformInfo === undefined) {
+        serverPlatform = 'neutral';
+    } else {
+        serverPlatform = platformSpecificPackages.find(
+            (p) =>
+                p.platformInfo.platform === platformInfo.platform &&
+                p.platformInfo.architecture === platformInfo.architecture
+        )!.rid;
+    }
+
+    const packagePath = await acquireNugetPackage(
+        `Microsoft.CodeAnalysis.LanguageServer.${serverPlatform}`,
+        roslynVersion,
+        interactive
+    );
+    return { packagePath, serverPlatform };
+}
+
 async function installRazor(packageJSON: any, platformInfo: PlatformInformation) {
     return await installPackageJsonDependency('Razor', packageJSON, platformInfo);
 }
@@ -145,7 +175,7 @@ async function installPackageJsonDependency(
     }
 }
 
-async function acquireNugetPackage(packageName: string, packageVersion: string): Promise<string> {
+async function acquireNugetPackage(packageName: string, packageVersion: string, interactive: boolean): Promise<string> {
     packageName = packageName.toLocaleLowerCase();
     const packageOutputPath = path.join(nugetTempPath, packageName, packageVersion);
     if (fs.existsSync(packageOutputPath)) {
@@ -157,9 +187,11 @@ async function acquireNugetPackage(packageName: string, packageVersion: string):
     const dotnetArgs = [
         'restore',
         path.join(rootPath, 'server'),
-        `/p:MicrosoftCodeAnalysisLanguageServerVersion=${packageVersion}`,
+        `/p:PackageName=${packageName}`,
+        `/p:PackageVersion=${packageVersion}`,
     ];
-    if (argv.interactive) {
+
+    if (interactive) {
         dotnetArgs.push('--interactive');
     }
 
@@ -181,14 +213,18 @@ async function acquireNugetPackage(packageName: string, packageVersion: string):
 }
 
 async function doPackageOffline() {
-    // Set the package version using git versioning.
+    // Set the package.json version based on the value in version.json.
     const versionInfo = await nbgv.getVersion();
     console.log(versionInfo.npmPackageVersion);
     await nbgv.setPackageVersion();
 
-    let prerelease = false;
+    let prerelease: boolean;
     if (argv.prerelease) {
+        console.log('Packaging prerelease version.');
         prerelease = true;
+    } else {
+        console.log('Packaging release version.');
+        prerelease = false;
     }
 
     try {
diff --git a/tasks/projectPaths.ts b/tasks/projectPaths.ts
index 94639aa18..5636f82b5 100644
--- a/tasks/projectPaths.ts
+++ b/tasks/projectPaths.ts
@@ -9,7 +9,7 @@ import { commandLineOptions } from './commandLineArguments';
 export const rootPath = path.resolve(__dirname, '..');
 
 const nodeModulesPath = path.join(rootPath, 'node_modules');
-export const vscePath = path.join(nodeModulesPath, 'vsce', 'vsce');
+export const vscePath = path.join(nodeModulesPath, '@vscode', 'vsce', 'vsce');
 export const mochaPath = path.join(nodeModulesPath, 'mocha', 'bin', 'mocha');
 export const jestPath = path.join(nodeModulesPath, 'jest', 'bin', 'jest');
 
@@ -21,14 +21,16 @@ export const codeExtensionPath = commandLineOptions.codeExtensionPath || rootPat
 
 export const omnisharpTestRootPath = path.join(rootPath, 'out', 'omnisharptest');
 export const omnisharpFeatureTestRunnerPath = path.join(omnisharpTestRootPath, 'runFeatureTests.js');
-export const omnisharpTestAssetsRootPath = path.join(
-    rootPath,
-    'omnisharptest',
-    'omnisharpIntegrationTests',
-    'testAssets'
-);
+
+export const integrationTestAssetsRootPath = path.join(rootPath, 'test', 'integrationTests', 'testAssets');
+export const razorIntegrationTestAssetsRootPath = path.join(rootPath, 'test', 'razorIntegrationTests', 'testAssets');
 
 export const testRootPath = path.join(rootPath, 'out', 'test');
-export const integrationTestRunnerPath = path.join(testRootPath, 'runIntegrationTests.js');
+export const integrationTestRunnerPath = path.join(testRootPath, 'integrationTests', 'runIntegrationTests.js');
+export const razorIntegrationTestRunnerPath = path.join(
+    testRootPath,
+    'razorIntegrationTests',
+    'runIntegrationTests.js'
+);
 
 export const nodePath = path.join(process.env.NVM_BIN ? `${process.env.NVM_BIN}${path.sep}` : '', 'node');
diff --git a/tasks/testTasks.ts b/tasks/testTasks.ts
index e17b0a233..cb8478ca8 100644
--- a/tasks/testTasks.ts
+++ b/tasks/testTasks.ts
@@ -8,15 +8,20 @@ import * as path from 'path';
 import {
     codeExtensionPath,
     omnisharpFeatureTestRunnerPath,
-    mochaPath,
     rootPath,
-    omnisharpTestAssetsRootPath,
+    integrationTestAssetsRootPath,
     omnisharpTestRootPath,
     testRootPath,
     integrationTestRunnerPath,
-    jestPath,
+    razorIntegrationTestAssetsRootPath,
+    razorIntegrationTestRunnerPath,
 } from './projectPaths';
 import spawnNode from './spawnNode';
+import * as jest from 'jest';
+import { Config } from '@jest/types';
+import { jestOmniSharpUnitTestProjectName } from '../omnisharptest/omnisharpUnitTests/jest.config';
+import { jestUnitTestProjectName } from '../test/unitTests/jest.config';
+import { razorTestProjectName } from '../test/razorTests/jest.config';
 
 gulp.task('omnisharptest:feature', async () => {
     const env = {
@@ -37,30 +42,27 @@ gulp.task('omnisharptest:feature', async () => {
     return result;
 });
 
-gulp.task('omnisharptest:unit', async () => {
-    const result = await spawnNode([
-        mochaPath,
-        '--ui',
-        'tdd',
-        '-c',
-        'out/omnisharptest/omnisharpUnitTests/**/*.test.js',
-    ]);
+gulp.task('test:razor', async () => {
+    runJestTest(razorTestProjectName);
+});
 
-    if (result.code === null || result.code > 0) {
-        // Ensure that gulp fails when tests fail
-        throw new Error(`Exit code: ${result.code}  Signal: ${result.signal}`);
-    }
+const razorIntegrationTestProjects = ['BasicRazorApp2_1'];
+for (const projectName of razorIntegrationTestProjects) {
+    gulp.task(`test:razorintegration:${projectName}`, async () => runIntegrationTest(projectName, /* razor */ true));
+}
 
-    return result;
-});
+gulp.task(
+    'test:razorintegration',
+    gulp.series(razorIntegrationTestProjects.map((projectName) => `test:razorintegration:${projectName}`))
+);
 
-gulp.task('omnisharp:jest:test', async () => {
-    runJestTest(/.*omnisharpJestTests.*/);
+gulp.task('omnisharptest:unit', async () => {
+    runJestTest(jestOmniSharpUnitTestProjectName);
 });
 
-const projectNames = ['singleCsproj', 'slnWithCsproj', 'slnFilterWithCsproj', 'BasicRazorApp2_1'];
+const omnisharpIntegrationTestProjects = ['singleCsproj', 'slnWithCsproj', 'slnFilterWithCsproj', 'BasicRazorApp2_1'];
 
-for (const projectName of projectNames) {
+for (const projectName of omnisharpIntegrationTestProjects) {
     gulp.task(`omnisharptest:integration:${projectName}:stdio`, async () =>
         runOmnisharpIntegrationTest(projectName, 'stdio')
     );
@@ -75,33 +77,41 @@ for (const projectName of projectNames) {
 
 gulp.task(
     'omnisharptest:integration',
-    gulp.series(projectNames.map((projectName) => `omnisharptest:integration:${projectName}`))
+    gulp.series(omnisharpIntegrationTestProjects.map((projectName) => `omnisharptest:integration:${projectName}`))
 );
 gulp.task(
     'omnisharptest:integration:stdio',
-    gulp.series(projectNames.map((projectName) => `omnisharptest:integration:${projectName}:stdio`))
+    gulp.series(omnisharpIntegrationTestProjects.map((projectName) => `omnisharptest:integration:${projectName}:stdio`))
 );
 gulp.task(
     'omnisharptest:integration:lsp',
-    gulp.series(projectNames.map((projectName) => `omnisharptest:integration:${projectName}:lsp`))
+    gulp.series(omnisharpIntegrationTestProjects.map((projectName) => `omnisharptest:integration:${projectName}:lsp`))
 );
 // TODO: Enable lsp integration tests once tests for unimplemented features are disabled.
 gulp.task(
     'omnisharptest',
-    gulp.series('omnisharp:jest:test', 'omnisharptest:feature', 'omnisharptest:unit', 'omnisharptest:integration:stdio')
+    gulp.series('omnisharptest:unit', 'omnisharptest:feature', 'omnisharptest:integration:stdio')
 );
 
-gulp.task('test:integration:slnWithCsproj', async () => runIntegrationTest('slnWithCsproj'));
-
 gulp.task('test:unit', async () => {
-    runJestTest(/unitTests.*\.ts/);
+    await runJestTest(jestUnitTestProjectName);
 });
 
-gulp.task('test', gulp.series('test:unit'));
+const integrationTestProjects = ['slnWithCsproj'];
+for (const projectName of integrationTestProjects) {
+    gulp.task(`test:integration:${projectName}`, async () => runIntegrationTest(projectName));
+}
+
+gulp.task(
+    'test:integration',
+    gulp.series(integrationTestProjects.map((projectName) => `test:integration:${projectName}`))
+);
+
+gulp.task('test', gulp.series('test:unit', 'test:integration', 'test:razor', 'test:razorintegration'));
 
 async function runOmnisharpIntegrationTest(testAssetName: string, engine: 'stdio' | 'lsp') {
     const workspaceFile = `omnisharp${engine === 'lsp' ? '_lsp' : ''}_${testAssetName}.code-workspace`;
-    const workspacePath = path.join(omnisharpTestAssetsRootPath, testAssetName, '.vscode', workspaceFile);
+    const workspacePath = path.join(integrationTestAssetsRootPath, testAssetName, '.vscode', workspaceFile);
     const codeTestsPath = path.join(omnisharpTestRootPath, 'omnisharpIntegrationTests');
 
     const env = {
@@ -129,26 +139,23 @@ async function runOmnisharpIntegrationTest(testAssetName: string, engine: 'stdio
     return result;
 }
 
-async function runIntegrationTest(testAssetName: string) {
+async function runIntegrationTest(testAssetName: string, razor = false) {
     const workspacePath = path.join(
-        omnisharpTestAssetsRootPath,
+        razor ? razorIntegrationTestAssetsRootPath : integrationTestAssetsRootPath,
         testAssetName,
         '.vscode',
         `lsp_tools_host_${testAssetName}.code-workspace`
     );
-    const codeTestsPath = path.join(testRootPath, 'integrationTests');
+    const codeTestsPath = path.join(testRootPath, razor ? 'razorIntegrationTests' : 'integrationTests');
 
     const env = {
-        OSVC_SUITE: testAssetName,
-        CODE_TESTS_PATH: codeTestsPath,
-        CODE_EXTENSIONS_PATH: codeExtensionPath,
         CODE_TESTS_WORKSPACE: workspacePath,
-        CODE_WORKSPACE_ROOT: rootPath,
+        CODE_EXTENSIONS_PATH: rootPath,
         EXTENSIONS_TESTS_PATH: path.join(codeTestsPath, 'index.js'),
-        CODE_DISABLE_EXTENSIONS: 'true',
     };
 
-    const result = await spawnNode([integrationTestRunnerPath, '--enable-source-maps'], { env, cwd: rootPath });
+    const runnerPath = razor ? razorIntegrationTestRunnerPath : integrationTestRunnerPath;
+    const result = await spawnNode([runnerPath, '--enable-source-maps'], { env, cwd: rootPath });
 
     if (result.code === null || result.code > 0) {
         // Ensure that gulp fails when tests fail
@@ -158,13 +165,18 @@ async function runIntegrationTest(testAssetName: string) {
     return result;
 }
 
-async function runJestTest(testFilterRegex: RegExp) {
-    const result = await spawnNode([jestPath, testFilterRegex.source]);
+async function runJestTest(project: string) {
+    const configPath = path.join(rootPath, 'jest.config.ts');
+    const { results } = await jest.runCLI(
+        {
+            config: configPath,
+            selectProjects: [project],
+            verbose: true,
+        } as Config.Argv,
+        [project]
+    );
 
-    if (result.code === null || result.code > 0) {
-        // Ensure that gulp fails when tests fail
-        throw new Error(`Exit code: ${result.code}  Signal: ${result.signal}`);
+    if (!results.success) {
+        throw new Error('Tests failed.');
     }
-
-    return result;
 }
diff --git a/test/integrationTests/index.ts b/test/integrationTests/index.ts
index 7aa7ac3f9..26731859a 100644
--- a/test/integrationTests/index.ts
+++ b/test/integrationTests/index.ts
@@ -3,15 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
-import * as testRunner from '../testRunner';
+import { runIntegrationTests } from '../runIntegrationTests';
+import { jestIntegrationTestProjectName } from './jest.config';
 
 export async function run() {
     process.env.RUNNING_INTEGRATION_TESTS = 'true';
 
-    return testRunner.run(path.resolve(__dirname, '.'), {
-        timeout: 120000, // this seems to timing out often in our pipeline
-        ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.)
-        useColors: true, // colored output from test results
-    });
+    await runIntegrationTests(jestIntegrationTestProjectName);
 }
diff --git a/test/integrationTests/integrationHelpers.ts b/test/integrationTests/integrationHelpers.ts
index 9d8d27f37..86b126469 100644
--- a/test/integrationTests/integrationHelpers.ts
+++ b/test/integrationTests/integrationHelpers.ts
@@ -6,6 +6,9 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { CSharpExtensionExports } from '../../src/csharpExtensionExports';
+import { existsSync } from 'fs';
+import { ServerStateChange } from '../../src/lsptoolshost/serverStateChange';
+import testAssetWorkspace from './testAssets/testAssetWorkspace';
 
 export async function activateCSharpExtension(): Promise<void> {
     // Ensure the dependent extension exists - when launching via F5 launch.json we can't install the extension prior to opening vscode.
@@ -22,11 +25,44 @@ export async function activateCSharpExtension(): Promise<void> {
         throw new Error('Failed to find installation of muhammad-sammy.csharp');
     }
 
+    // Run a restore manually to make sure the project is up to date since we don't have automatic restore.
+    await testAssetWorkspace.restoreLspToolsHostAsync();
+
+    // If the extension is already active, we need to restart it to ensure we start with a clean server state.
+    // For example, a previous test may have changed configs, deleted restored packages or made other changes that would put it in an invalid state.
+    let shouldRestart = false;
+    if (csharpExtension.isActive) {
+        shouldRestart = true;
+    }
+
     // Explicitly await the extension activation even if completed so that we capture any errors it threw during activation.
     await csharpExtension.activate();
-
     await csharpExtension.exports.initializationFinished();
     console.log('muhammad-sammy.csharp activated');
+    console.log(`Extension Log Directory: ${csharpExtension.exports.logDirectory}`);
+
+    if (shouldRestart) {
+        // Register to wait for initialization events and restart the server.
+        const waitForInitialProjectLoad = new Promise<void>((resolve, _) => {
+            csharpExtension.exports.experimental.languageServerEvents.onServerStateChange(async (state) => {
+                if (state === ServerStateChange.ProjectInitializationComplete) {
+                    resolve();
+                }
+            });
+        });
+        await vscode.commands.executeCommand('dotnet.restartServer');
+        await waitForInitialProjectLoad;
+    }
+}
+
+export async function openFileInWorkspaceAsync(relativeFilePath: string): Promise<void> {
+    const root = vscode.workspace.workspaceFolders![0].uri.fsPath;
+    const filePath = path.join(root, relativeFilePath);
+    if (!existsSync(filePath)) {
+        throw new Error(`File ${filePath} does not exist`);
+    }
+
+    await vscode.commands.executeCommand('vscode.open', vscode.Uri.file(filePath));
 }
 
 export function isRazorWorkspace(workspace: typeof vscode.workspace) {
diff --git a/test/integrationTests/jest.config.ts b/test/integrationTests/jest.config.ts
new file mode 100644
index 000000000..0d8e8b8ee
--- /dev/null
+++ b/test/integrationTests/jest.config.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const jestIntegrationTestProjectName = 'Integration Tests';
+
+/**
+ * Defines a project configuration for jest integration tests.
+ */
+const integrationTestConfig: Config = {
+    ...baseProjectConfig,
+    displayName: jestIntegrationTestProjectName,
+    roots: ['<rootDir>'],
+    testEnvironment: '<rootDir>/jestSetup/vsCodeEnvironment.ts',
+    setupFilesAfterEnv: ['<rootDir>/jestSetup/vsCodeFramework.ts'],
+};
+
+export default integrationTestConfig;
diff --git a/test/integrationTests/jestSetup/vsCodeEnvironment.ts b/test/integrationTests/jestSetup/vsCodeEnvironment.ts
new file mode 100644
index 000000000..0c886c116
--- /dev/null
+++ b/test/integrationTests/jestSetup/vsCodeEnvironment.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { JestEnvironmentConfig, EnvironmentContext } from '@jest/environment';
+import { TestEnvironment } from 'jest-environment-node';
+
+/**
+ * Defines a custom jest environment that allows us to replace vscode module imports with the
+ * instance from the vscode extension in the test runner.
+ */
+class VsCodeEnvironment extends TestEnvironment {
+    constructor(config: JestEnvironmentConfig, context: EnvironmentContext) {
+        super(config, context);
+    }
+
+    public async setup() {
+        await super.setup();
+        this.global.vscode = vscode;
+    }
+
+    public async teardown() {
+        this.global.vscode = {};
+        return await super.teardown();
+    }
+}
+
+module.exports = VsCodeEnvironment;
diff --git a/test/integrationTests/jestSetup/vsCodeFramework.ts b/test/integrationTests/jestSetup/vsCodeFramework.ts
new file mode 100644
index 000000000..816be1203
--- /dev/null
+++ b/test/integrationTests/jestSetup/vsCodeFramework.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { jest } from '@jest/globals';
+
+// Defines a virtual mock for the vscode library since it doesn't exist until it gets loaded in by the vscode extension process.
+jest.mock('vscode', () => (global as any).vscode, { virtual: true });
diff --git a/test/integrationTests/lspInlayHints.integration.test.ts b/test/integrationTests/lspInlayHints.integration.test.ts
index 0c57d01f0..ed307e14f 100644
--- a/test/integrationTests/lspInlayHints.integration.test.ts
+++ b/test/integrationTests/lspInlayHints.integration.test.ts
@@ -3,24 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
-
-import { should, assert } from 'chai';
-import testAssetWorkspace from '../../omnisharptest/omnisharpIntegrationTests/testAssets/testAssetWorkspace';
 import * as path from 'path';
-import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
+import * as vscode from 'vscode';
+import * as jestLib from '@jest/globals';
+import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import * as integrationHelpers from './integrationHelpers';
 import { InlayHint, InlayHintKind, Position } from 'vscode-languageserver-protocol';
 
-suite(`LSP Inlay Hints ${testAssetWorkspace.description}`, function () {
-    let fileUri: vscode.Uri;
-
-    suiteSetup(async function () {
-        should();
-
-        if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
-            this.skip();
-        }
-
+jestLib.describe(`LSP Inlay Hints ${testAssetWorkspace.description}`, function () {
+    jestLib.beforeAll(async function () {
         const editorConfig = vscode.workspace.getConfiguration('editor');
         await editorConfig.update('inlayHints.enabled', true);
         const dotnetConfig = vscode.workspace.getConfiguration('dotnet');
@@ -39,41 +30,41 @@ suite(`LSP Inlay Hints ${testAssetWorkspace.description}`, function () {
         await csharpConfig.update('inlayHints.enableInlayHintsForLambdaParameterTypes', true);
         await csharpConfig.update('inlayHints.enableInlayHintsForImplicitObjectCreation', true);
 
-        const fileName = 'inlayHints.cs';
-        const projectDirectory = testAssetWorkspace.projects[0].projectDirectoryPath;
-        const filePath = path.join(projectDirectory, fileName);
-        fileUri = vscode.Uri.file(filePath);
-
-        await vscode.commands.executeCommand('vscode.open', fileUri);
-        await activateCSharpExtension();
+        await integrationHelpers.openFileInWorkspaceAsync(path.join('src', 'app', 'inlayHints.cs'));
+        await integrationHelpers.activateCSharpExtension();
     });
 
-    suiteTeardown(async () => {
+    jestLib.afterAll(async () => {
         await testAssetWorkspace.cleanupWorkspace();
     });
 
-    test('Hints retrieved for region', async () => {
+    jestLib.test('Hints retrieved for region', async () => {
         const range = new vscode.Range(new vscode.Position(4, 8), new vscode.Position(15, 85));
+        const activeDocument = vscode.window.activeTextEditor?.document.uri;
+        if (!activeDocument) {
+            throw new Error('No active document');
+        }
         const hints: vscode.InlayHint[] = await vscode.commands.executeCommand(
             'vscode.executeInlayHintProvider',
-            fileUri,
+            activeDocument,
             range
         );
 
-        assert.lengthOf(hints, 5);
+        jestLib.expect(hints).toHaveLength(6);
 
         assertInlayHintEqual(hints[0], InlayHint.create(Position.create(6, 12), 'InlayHints', InlayHintKind.Type));
         assertInlayHintEqual(hints[1], InlayHint.create(Position.create(7, 27), 'InlayHints', InlayHintKind.Type));
-        assertInlayHintEqual(hints[2], InlayHint.create(Position.create(9, 17), 'i:', InlayHintKind.Parameter));
-        assertInlayHintEqual(hints[3], InlayHint.create(Position.create(10, 15), 'param1:', InlayHintKind.Parameter));
-        assertInlayHintEqual(hints[4], InlayHint.create(Position.create(11, 27), 'param1:', InlayHintKind.Parameter));
+        assertInlayHintEqual(hints[2], InlayHint.create(Position.create(8, 28), 'string', InlayHintKind.Type));
+        assertInlayHintEqual(hints[3], InlayHint.create(Position.create(9, 17), 'i:', InlayHintKind.Parameter));
+        assertInlayHintEqual(hints[4], InlayHint.create(Position.create(10, 15), 'param1:', InlayHintKind.Parameter));
+        assertInlayHintEqual(hints[5], InlayHint.create(Position.create(11, 27), 'param1:', InlayHintKind.Parameter));
 
         function assertInlayHintEqual(actual: vscode.InlayHint, expected: InlayHint) {
             const actualLabel = actual.label as string;
-            assert.equal(actualLabel, expected.label);
-            assert.equal(actual.position.line, expected.position.line);
-            assert.equal(actual.position.character, expected.position.character);
-            assert.equal(actual.kind, expected.kind);
+            jestLib.expect(actualLabel).toBe(expected.label);
+            jestLib.expect(actual.position.line).toBe(expected.position.line);
+            jestLib.expect(actual.position.character).toBe(expected.position.character);
+            jestLib.expect(actual.kind).toBe(expected.kind);
         }
     });
 });
diff --git a/test/integrationTests/runIntegrationTests.ts b/test/integrationTests/runIntegrationTests.ts
new file mode 100644
index 000000000..2a0fb2901
--- /dev/null
+++ b/test/integrationTests/runIntegrationTests.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as runner from '../runIntegrationTests';
+
+runner.main();
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_BasicRazorApp2_1.code-workspace b/test/integrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_BasicRazorApp2_1.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_BasicRazorApp2_1.code-workspace
rename to test/integrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_BasicRazorApp2_1.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_lsp_BasicRazorApp2_1.code-workspace b/test/integrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_lsp_BasicRazorApp2_1.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_lsp_BasicRazorApp2_1.code-workspace
rename to test/integrationTests/testAssets/BasicRazorApp2_1/.vscode/omnisharp_lsp_BasicRazorApp2_1.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj b/test/integrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj
rename to test/integrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor b/test/integrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor
rename to test/integrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml b/test/integrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml
rename to test/integrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/Program.cs b/test/integrationTests/testAssets/BasicRazorApp2_1/Program.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/Program.cs
rename to test/integrationTests/testAssets/BasicRazorApp2_1/Program.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml b/test/integrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml
rename to test/integrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/NuGet.config b/test/integrationTests/testAssets/NuGet.config
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/NuGet.config
rename to test/integrationTests/testAssets/NuGet.config
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/basicRazorApp21.ts b/test/integrationTests/testAssets/basicRazorApp21.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/basicRazorApp21.ts
rename to test/integrationTests/testAssets/basicRazorApp21.ts
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj.ts b/test/integrationTests/testAssets/singleCsproj.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj.ts
rename to test/integrationTests/testAssets/singleCsproj.ts
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/.gitignore b/test/integrationTests/testAssets/singleCsproj/.gitignore
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/.gitignore
rename to test/integrationTests/testAssets/singleCsproj/.gitignore
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/.vscode/omnisharp_lsp_singleCsproj.code-workspace b/test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_lsp_singleCsproj.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/.vscode/omnisharp_lsp_singleCsproj.code-workspace
rename to test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_lsp_singleCsproj.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/.vscode/omnisharp_singleCsproj.code-workspace b/test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_singleCsproj.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/.vscode/omnisharp_singleCsproj.code-workspace
rename to test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_singleCsproj.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/A.cs b/test/integrationTests/testAssets/singleCsproj/A.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/A.cs
rename to test/integrationTests/testAssets/singleCsproj/A.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/DocComments.cs b/test/integrationTests/testAssets/singleCsproj/DocComments.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/DocComments.cs
rename to test/integrationTests/testAssets/singleCsproj/DocComments.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/ISomeInterface.cs b/test/integrationTests/testAssets/singleCsproj/ISomeInterface.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/ISomeInterface.cs
rename to test/integrationTests/testAssets/singleCsproj/ISomeInterface.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/Program.cs b/test/integrationTests/testAssets/singleCsproj/Program.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/Program.cs
rename to test/integrationTests/testAssets/singleCsproj/Program.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/SomeInterfaceImpl.cs b/test/integrationTests/testAssets/singleCsproj/SomeInterfaceImpl.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/SomeInterfaceImpl.cs
rename to test/integrationTests/testAssets/singleCsproj/SomeInterfaceImpl.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/completion.cs b/test/integrationTests/testAssets/singleCsproj/completion.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/completion.cs
rename to test/integrationTests/testAssets/singleCsproj/completion.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/completionBase.cs b/test/integrationTests/testAssets/singleCsproj/completionBase.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/completionBase.cs
rename to test/integrationTests/testAssets/singleCsproj/completionBase.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/definition.cs b/test/integrationTests/testAssets/singleCsproj/definition.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/definition.cs
rename to test/integrationTests/testAssets/singleCsproj/definition.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/diagnostics.cs b/test/integrationTests/testAssets/singleCsproj/diagnostics.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/diagnostics.cs
rename to test/integrationTests/testAssets/singleCsproj/diagnostics.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/documentSymbols.cs b/test/integrationTests/testAssets/singleCsproj/documentSymbols.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/documentSymbols.cs
rename to test/integrationTests/testAssets/singleCsproj/documentSymbols.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/hover.cs b/test/integrationTests/testAssets/singleCsproj/hover.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/hover.cs
rename to test/integrationTests/testAssets/singleCsproj/hover.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/implementation.cs b/test/integrationTests/testAssets/singleCsproj/implementation.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/implementation.cs
rename to test/integrationTests/testAssets/singleCsproj/implementation.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/inlayHints.cs b/test/integrationTests/testAssets/singleCsproj/inlayHints.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/inlayHints.cs
rename to test/integrationTests/testAssets/singleCsproj/inlayHints.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/reference.cs b/test/integrationTests/testAssets/singleCsproj/reference.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/reference.cs
rename to test/integrationTests/testAssets/singleCsproj/reference.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/remap.cs b/test/integrationTests/testAssets/singleCsproj/remap.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/remap.cs
rename to test/integrationTests/testAssets/singleCsproj/remap.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/remapped.txt b/test/integrationTests/testAssets/singleCsproj/remapped.txt
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/remapped.txt
rename to test/integrationTests/testAssets/singleCsproj/remapped.txt
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/secondaryDiagnostics.cs b/test/integrationTests/testAssets/singleCsproj/secondaryDiagnostics.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/secondaryDiagnostics.cs
rename to test/integrationTests/testAssets/singleCsproj/secondaryDiagnostics.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/semantictokens.cs b/test/integrationTests/testAssets/singleCsproj/semantictokens.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/semantictokens.cs
rename to test/integrationTests/testAssets/singleCsproj/semantictokens.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/sigHelp.cs b/test/integrationTests/testAssets/singleCsproj/sigHelp.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/sigHelp.cs
rename to test/integrationTests/testAssets/singleCsproj/sigHelp.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/singleCsproj.csproj b/test/integrationTests/testAssets/singleCsproj/singleCsproj.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/singleCsproj.csproj
rename to test/integrationTests/testAssets/singleCsproj/singleCsproj.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/typeDefinition.cs b/test/integrationTests/testAssets/singleCsproj/typeDefinition.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj/typeDefinition.cs
rename to test/integrationTests/testAssets/singleCsproj/typeDefinition.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj.ts b/test/integrationTests/testAssets/slnFilterWithCsproj.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj.ts
rename to test/integrationTests/testAssets/slnFilterWithCsproj.ts
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/.gitignore b/test/integrationTests/testAssets/slnFilterWithCsproj/.gitignore
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/.gitignore
rename to test/integrationTests/testAssets/slnFilterWithCsproj/.gitignore
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_lsp_slnFilterWithCsproj.code-workspace b/test/integrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_lsp_slnFilterWithCsproj.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_lsp_slnFilterWithCsproj.code-workspace
rename to test/integrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_lsp_slnFilterWithCsproj.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_slnFilterWithCsproj.code-workspace b/test/integrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_slnFilterWithCsproj.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_slnFilterWithCsproj.code-workspace
rename to test/integrationTests/testAssets/slnFilterWithCsproj/.vscode/omnisharp_slnFilterWithCsproj.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/SolutionFile.sln b/test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFile.sln
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/SolutionFile.sln
rename to test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFile.sln
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/SolutionFilter.slnf b/test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFilter.slnf
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/SolutionFilter.slnf
rename to test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFilter.slnf
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/A.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/A.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/A.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/A.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/DocComments.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/DocComments.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/DocComments.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/DocComments.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/ISomeInterface.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/ISomeInterface.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/ISomeInterface.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/ISomeInterface.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/Program.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/Program.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/Program.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/Program.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/SomeInterfaceImpl.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/SomeInterfaceImpl.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/SomeInterfaceImpl.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/SomeInterfaceImpl.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/app.csproj b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/app.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/app.csproj
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/app.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/completion.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/completion.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/completion.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/completion.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/completionBase.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/completionBase.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/completionBase.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/completionBase.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/definition.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/definition.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/definition.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/definition.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/diagnostics.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/diagnostics.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/diagnostics.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/diagnostics.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/documentSymbols.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/documentSymbols.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/documentSymbols.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/documentSymbols.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/hover.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/hover.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/hover.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/hover.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/implementation.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/implementation.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/implementation.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/implementation.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/inlayHints.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/inlayHints.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/inlayHints.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/inlayHints.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/reference.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/reference.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/reference.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/reference.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/remap.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remap.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/remap.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remap.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/remapped.txt b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remapped.txt
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/remapped.txt
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remapped.txt
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/secondaryDiagnostics.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/secondaryDiagnostics.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/secondaryDiagnostics.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/secondaryDiagnostics.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/semantictokens.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/semantictokens.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/semantictokens.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/semantictokens.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/sigHelp.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/sigHelp.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/sigHelp.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/sigHelp.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/typeDefinition.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/typeDefinition.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/app/typeDefinition.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/app/typeDefinition.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/lib/Class1.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/Class1.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/lib/Class1.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/Class1.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/lib/lib.csproj b/test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/lib.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/src/lib/lib.csproj
rename to test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/lib.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/test/UnitTest1.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/test/UnitTest1.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/test/UnitTest1.cs
rename to test/integrationTests/testAssets/slnFilterWithCsproj/test/UnitTest1.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/test/test.csproj b/test/integrationTests/testAssets/slnFilterWithCsproj/test/test.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj/test/test.csproj
rename to test/integrationTests/testAssets/slnFilterWithCsproj/test/test.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj.ts b/test/integrationTests/testAssets/slnWithCsproj.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj.ts
rename to test/integrationTests/testAssets/slnWithCsproj.ts
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.gitignore b/test/integrationTests/testAssets/slnWithCsproj/.gitignore
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.gitignore
rename to test/integrationTests/testAssets/slnWithCsproj/.gitignore
diff --git a/test/integrationTests/testAssets/slnWithCsproj/.runsettings b/test/integrationTests/testAssets/slnWithCsproj/.runsettings
new file mode 100644
index 000000000..665e1c434
--- /dev/null
+++ b/test/integrationTests/testAssets/slnWithCsproj/.runsettings
@@ -0,0 +1,5 @@
+<RunSettings>
+    <RunConfiguration>
+        <TestCaseFilter>TestCategory=include</TestCaseFilter>
+    </RunConfiguration>
+</RunSettings>
\ No newline at end of file
diff --git a/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace b/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace
new file mode 100644
index 000000000..cef8ba814
--- /dev/null
+++ b/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace
@@ -0,0 +1,13 @@
+{	
+    "folders": [	
+        {	
+            "path": ".."	
+        }	
+    ],	
+    "settings": {	
+        "dotnet.defaultSolution": "b_SecondInOrder_SlnFile.sln",	
+        "dotnet.server.trace": "Trace",	
+        "dotnet.server.useOmnisharp": false,	
+        "omnisharp.enableLspDriver": false,	
+    }	
+}
\ No newline at end of file
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace b/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace
rename to test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace b/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace
rename to test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/b_SecondInOrder_SlnFile.sln b/test/integrationTests/testAssets/slnWithCsproj/b_SecondInOrder_SlnFile.sln
similarity index 78%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/b_SecondInOrder_SlnFile.sln
rename to test/integrationTests/testAssets/slnWithCsproj/b_SecondInOrder_SlnFile.sln
index 9cef673b8..7878b7d6d 100644
--- a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/b_SecondInOrder_SlnFile.sln
+++ b/test/integrationTests/testAssets/slnWithCsproj/b_SecondInOrder_SlnFile.sln
@@ -10,8 +10,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "lib", "src\lib\lib.csproj",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{4679428B-0CA0-4228-B8C0-B676B34A1B30}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generator", "generator\generator.csproj", "{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,18 +56,6 @@ Global
 		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x64.Build.0 = Release|x64
 		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x86.ActiveCfg = Release|x86
 		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x86.Build.0 = Release|x86
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Debug|x64.Build.0 = Debug|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Debug|x86.Build.0 = Debug|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Release|x64.ActiveCfg = Release|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Release|x64.Build.0 = Release|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Release|x86.ActiveCfg = Release|Any CPU
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -77,7 +63,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
 		{717BE881-D74C-45FC-B55D-2085499E1BF8} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
-		{29F9B261-D48D-4D9B-9005-FB6D3B4F9CC4} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8D6D9870-8770-4AB0-8142-CC80181A8DB7}
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/A.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/A.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/A.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/A.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/DocComments.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/DocComments.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/DocComments.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/DocComments.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/ISomeInterface.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/ISomeInterface.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/ISomeInterface.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/ISomeInterface.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/Program.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/Program.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/Program.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/Program.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/SomeInterfaceImpl.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/SomeInterfaceImpl.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/SomeInterfaceImpl.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/SomeInterfaceImpl.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/app.csproj b/test/integrationTests/testAssets/slnWithCsproj/src/app/app.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/app.csproj
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/app.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/completion.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/completion.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/completion.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/completion.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/completionBase.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/completionBase.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/completionBase.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/completionBase.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/definition.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/definition.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/definition.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/definition.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/diagnostics.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/diagnostics.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/diagnostics.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/diagnostics.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/documentSymbols.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/documentSymbols.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/documentSymbols.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/documentSymbols.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/hover.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/hover.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/hover.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/hover.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/implementation.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/implementation.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/implementation.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/implementation.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/inlayHints.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/inlayHints.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/inlayHints.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/inlayHints.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/reference.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/reference.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/reference.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/reference.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/remap.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/remap.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/remap.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/remap.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/remapped.txt b/test/integrationTests/testAssets/slnWithCsproj/src/app/remapped.txt
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/remapped.txt
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/remapped.txt
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/secondaryDiagnostics.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/secondaryDiagnostics.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/secondaryDiagnostics.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/secondaryDiagnostics.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/semantictokens.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/semantictokens.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/semantictokens.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/semantictokens.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/sigHelp.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/sigHelp.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/sigHelp.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/sigHelp.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/typeDefinition.cs b/test/integrationTests/testAssets/slnWithCsproj/src/app/typeDefinition.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/app/typeDefinition.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/app/typeDefinition.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/lib/Class1.cs b/test/integrationTests/testAssets/slnWithCsproj/src/lib/Class1.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/lib/Class1.cs
rename to test/integrationTests/testAssets/slnWithCsproj/src/lib/Class1.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/lib/lib.csproj b/test/integrationTests/testAssets/slnWithCsproj/src/lib/lib.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/src/lib/lib.csproj
rename to test/integrationTests/testAssets/slnWithCsproj/src/lib/lib.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/test/UnitTest1.cs b/test/integrationTests/testAssets/slnWithCsproj/test/UnitTest1.cs
similarity index 58%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/test/UnitTest1.cs
rename to test/integrationTests/testAssets/slnWithCsproj/test/UnitTest1.cs
index cccd26ef5..0fb618429 100644
--- a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/test/UnitTest1.cs
+++ b/test/integrationTests/testAssets/slnWithCsproj/test/UnitTest1.cs
@@ -10,5 +10,12 @@ public void Test1()
         {
 
         }
+
+        [Fact]
+        [Trait("TestCategory", "include")]
+        public void Test2()
+        {
+
+        }
     }
 }
diff --git a/test/integrationTests/testAssets/slnWithCsproj/test/test.csproj b/test/integrationTests/testAssets/slnWithCsproj/test/test.csproj
new file mode 100644
index 000000000..8e0e160f9
--- /dev/null
+++ b/test/integrationTests/testAssets/slnWithCsproj/test/test.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator.ts b/test/integrationTests/testAssets/slnWithGenerator.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator.ts
rename to test/integrationTests/testAssets/slnWithGenerator.ts
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/.vscode/settings.json b/test/integrationTests/testAssets/slnWithGenerator/.vscode/settings.json
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/.vscode/settings.json
rename to test/integrationTests/testAssets/slnWithGenerator/.vscode/settings.json
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/app/GeneratorTrigger.cs b/test/integrationTests/testAssets/slnWithGenerator/app/GeneratorTrigger.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/app/GeneratorTrigger.cs
rename to test/integrationTests/testAssets/slnWithGenerator/app/GeneratorTrigger.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/app/app.csproj b/test/integrationTests/testAssets/slnWithGenerator/app/app.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/app/app.csproj
rename to test/integrationTests/testAssets/slnWithGenerator/app/app.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/generator/MainGenerator.cs b/test/integrationTests/testAssets/slnWithGenerator/generator/MainGenerator.cs
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/generator/MainGenerator.cs
rename to test/integrationTests/testAssets/slnWithGenerator/generator/MainGenerator.cs
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/generator/generator.csproj b/test/integrationTests/testAssets/slnWithGenerator/generator/generator.csproj
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/generator/generator.csproj
rename to test/integrationTests/testAssets/slnWithGenerator/generator/generator.csproj
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/slnWithGenerator.sln b/test/integrationTests/testAssets/slnWithGenerator/slnWithGenerator.sln
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator/slnWithGenerator.sln
rename to test/integrationTests/testAssets/slnWithGenerator/slnWithGenerator.sln
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/spawnGit.ts b/test/integrationTests/testAssets/spawnGit.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/spawnGit.ts
rename to test/integrationTests/testAssets/spawnGit.ts
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/testAssetWorkspace.ts b/test/integrationTests/testAssets/testAssetWorkspace.ts
similarity index 100%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/testAssetWorkspace.ts
rename to test/integrationTests/testAssets/testAssetWorkspace.ts
diff --git a/test/integrationTests/testAssets/testAssets.ts b/test/integrationTests/testAssets/testAssets.ts
new file mode 100644
index 000000000..5f385a078
--- /dev/null
+++ b/test/integrationTests/testAssets/testAssets.ts
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'async-file';
+import * as path from 'path';
+import * as vscode from 'vscode';
+import spawnGit from '../../../test/integrationTests/testAssets/spawnGit';
+import { execChildProcess } from '../../../src/common';
+
+export class TestAssetProject {
+    constructor(project: ITestAssetProject) {
+        this.relativeFilePath = project.relativeFilePath;
+    }
+
+    relativeFilePath: string;
+
+    get projectDirectoryPath(): string {
+        return path.join(vscode.workspace.workspaceFolders![0].uri.fsPath, path.dirname(this.relativeFilePath));
+    }
+
+    async addFileWithContents(fileName: string, contents: string): Promise<vscode.Uri> {
+        const dir = this.projectDirectoryPath;
+        const loc = path.join(dir, fileName);
+        await fs.writeTextFile(loc, contents);
+        return vscode.Uri.file(loc);
+    }
+}
+
+export class TestAssetWorkspace {
+    constructor(workspace: ITestAssetWorkspace) {
+        this.projects = workspace.projects.map((w) => new TestAssetProject(w));
+
+        this.description = workspace.description;
+    }
+
+    get vsCodeDirectoryPath(): string {
+        return path.join(vscode.workspace.workspaceFolders![0].uri.fsPath, '.vscode');
+    }
+
+    get launchJsonPath(): string {
+        return path.join(this.vsCodeDirectoryPath, 'launch.json');
+    }
+
+    get tasksJsonPath(): string {
+        return path.join(this.vsCodeDirectoryPath, 'tasks.json');
+    }
+
+    async cleanupWorkspace(): Promise<void> {
+        const workspaceRootPath = vscode.workspace.workspaceFolders![0].uri.fsPath;
+        const cleanUpRoutine = async () => {
+            await vscode.commands.executeCommand('workbench.action.closeAllEditors');
+            await spawnGit(['clean', '-xdf', '.'], { cwd: workspaceRootPath });
+            await spawnGit(['checkout', '--', '.'], { cwd: workspaceRootPath });
+        };
+
+        const sleep = async () => new Promise((resolve) => setTimeout(resolve, 2 * 1000));
+
+        try {
+            await cleanUpRoutine();
+        } catch (error) {
+            // Its possible that cleanup fails for locked files etc, for this reason retry is added.
+            await sleep();
+            await cleanUpRoutine();
+        }
+    }
+
+    /**
+     * Temporary workaround for lack of restore support in the roslyn server.
+     * Replace when https://github.com/dotnet/vscode-csharp/issues/5725 is fixed.
+     */
+    async restoreLspToolsHostAsync(): Promise<void> {
+        const root = vscode.workspace.workspaceFolders![0].uri.fsPath;
+        const output = await execChildProcess(`dotnet restore ${root}`, process.cwd(), process.env);
+        console.log(output);
+    }
+
+    description: string;
+
+    projects: TestAssetProject[];
+}
+
+export interface ITestAssetProject {
+    relativeFilePath: string;
+}
+
+export interface ITestAssetWorkspace {
+    description: string;
+    projects: ITestAssetProject[];
+}
diff --git a/test/integrationTests/unitTests.integration.test.ts b/test/integrationTests/unitTests.integration.test.ts
new file mode 100644
index 000000000..4b94ea5ff
--- /dev/null
+++ b/test/integrationTests/unitTests.integration.test.ts
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as path from 'path';
+import * as jestLib from '@jest/globals';
+import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import { activateCSharpExtension, openFileInWorkspaceAsync } from './integrationHelpers';
+import { TestProgress } from '../../src/lsptoolshost/roslynProtocol';
+
+jestLib.describe(`Unit Testing ${testAssetWorkspace.description}`, function () {
+    jestLib.beforeAll(async function () {
+        await activateCSharpExtension();
+    });
+
+    jestLib.beforeEach(async function () {
+        vscode.workspace
+            .getConfiguration()
+            .update('dotnet.unitTests.runSettingsPath', undefined, vscode.ConfigurationTarget.Workspace);
+        const fileName = path.join('test', 'UnitTest1.cs');
+        await openFileInWorkspaceAsync(fileName);
+    });
+
+    jestLib.afterAll(async () => {
+        await testAssetWorkspace.cleanupWorkspace();
+    });
+
+    jestLib.test('Unit test code lens items are displayed', async () => {
+        const codeLenses = await getCodeLensesAsync();
+        jestLib.expect(codeLenses).toHaveLength(9);
+
+        const classRange = new vscode.Range(new vscode.Position(5, 17), new vscode.Position(5, 26));
+
+        // Class level debug all tests
+        jestLib.expect(codeLenses[1].command?.command).toBe('dotnet.test.run');
+        jestLib.expect(codeLenses[1].command?.title).toBe('Debug All Tests');
+        jestLib.expect(codeLenses[1].command?.arguments![0].attachDebugger).toBe(true);
+        jestLib.expect(codeLenses[1].range).toStrictEqual(classRange);
+
+        // Class level run all tests
+        jestLib.expect(codeLenses[2].command?.command).toBe('dotnet.test.run');
+        jestLib.expect(codeLenses[2].command?.title).toBe('Run All Tests');
+        jestLib.expect(codeLenses[2].command?.arguments![0].attachDebugger).toBe(false);
+        jestLib.expect(codeLenses[2].range).toStrictEqual(classRange);
+
+        let methodRange = new vscode.Range(new vscode.Position(8, 20), new vscode.Position(8, 25));
+        // Method level run and debug test
+        jestLib.expect(codeLenses[4].command?.command).toBe('dotnet.test.run');
+        jestLib.expect(codeLenses[4].command?.title).toBe('Debug Test');
+        jestLib.expect(codeLenses[4].command?.arguments![0].attachDebugger).toBe(true);
+        jestLib.expect(codeLenses[4].range).toStrictEqual(methodRange);
+        jestLib.expect(codeLenses[5].command?.command).toBe('dotnet.test.run');
+        jestLib.expect(codeLenses[5].command?.title).toBe('Run Test');
+        jestLib.expect(codeLenses[5].command?.arguments![0].attachDebugger).toBe(false);
+        jestLib.expect(codeLenses[5].range).toStrictEqual(methodRange);
+
+        methodRange = new vscode.Range(new vscode.Position(15, 20), new vscode.Position(15, 25));
+        jestLib.expect(codeLenses[7].command?.command).toBe('dotnet.test.run');
+        jestLib.expect(codeLenses[7].command?.title).toBe('Debug Test');
+        jestLib.expect(codeLenses[7].command?.arguments![0].attachDebugger).toBe(true);
+        jestLib.expect(codeLenses[7].range).toStrictEqual(methodRange);
+        jestLib.expect(codeLenses[8].command?.command).toBe('dotnet.test.run');
+        jestLib.expect(codeLenses[8].command?.title).toBe('Run Test');
+        jestLib.expect(codeLenses[8].command?.arguments![0].attachDebugger).toBe(false);
+        jestLib.expect(codeLenses[8].range).toStrictEqual(methodRange);
+    });
+
+    jestLib.test('Code lens command executes tests', async () => {
+        const codeLenses = await getCodeLensesAsync();
+        jestLib.expect(codeLenses).toHaveLength(9);
+
+        const runAllTestsCommand = codeLenses[2].command!;
+        jestLib.expect(runAllTestsCommand.title).toBe('Run All Tests');
+
+        const testResults = await vscode.commands.executeCommand<TestProgress | undefined>(
+            runAllTestsCommand.command,
+            runAllTestsCommand.arguments![0]
+        );
+        jestLib.expect(testResults).toBeDefined();
+        jestLib.expect(testResults?.totalTests).toEqual(2);
+        jestLib.expect(testResults?.testsPassed).toEqual(2);
+        jestLib.expect(testResults?.testsFailed).toEqual(0);
+        jestLib.expect(testResults?.testsSkipped).toEqual(0);
+    });
+
+    jestLib.test('dotnet.test.runTestsInContext executes tests', async () => {
+        const activeEditor = vscode.window.activeTextEditor;
+        if (!activeEditor) {
+            throw new Error('No active editor');
+        }
+
+        // Ensure the method is selected in the editor.
+        activeEditor.selection = new vscode.Selection(new vscode.Position(8, 20), new vscode.Position(8, 25));
+        const testResults = await vscode.commands.executeCommand<TestProgress | undefined>(
+            'dotnet.test.runTestsInContext',
+            activeEditor
+        );
+        jestLib.expect(testResults).toBeDefined();
+        jestLib.expect(testResults?.totalTests).toEqual(1);
+        jestLib.expect(testResults?.testsPassed).toEqual(1);
+        jestLib.expect(testResults?.testsFailed).toEqual(0);
+        jestLib.expect(testResults?.testsSkipped).toEqual(0);
+    });
+
+    jestLib.test('Run tests uses .runsettings', async () => {
+        await vscode.workspace.getConfiguration().update('dotnet.unitTests.runSettingsPath', '.runsettings');
+
+        const codeLenses = await getCodeLensesAsync();
+        jestLib.expect(codeLenses).toHaveLength(9);
+
+        const runAllTestsCommand = codeLenses[2].command!;
+        jestLib.expect(runAllTestsCommand.title).toBe('Run All Tests');
+
+        const testResults = await vscode.commands.executeCommand<TestProgress | undefined>(
+            runAllTestsCommand.command,
+            runAllTestsCommand.arguments![0]
+        );
+        jestLib.expect(testResults).toBeDefined();
+        jestLib.expect(testResults?.totalTests).toEqual(1);
+        jestLib.expect(testResults?.testsPassed).toEqual(1);
+        jestLib.expect(testResults?.testsFailed).toEqual(0);
+        jestLib.expect(testResults?.testsSkipped).toEqual(0);
+    });
+});
+
+async function getCodeLensesAsync(): Promise<vscode.CodeLens[]> {
+    const activeEditor = vscode.window.activeTextEditor;
+    if (!activeEditor) {
+        throw new Error('No active editor');
+    }
+
+    // The number of code lens items to resolve.  Set to a high number so we get pretty much everything in the document.
+    const resolvedItemCount = 100;
+
+    const codeLenses = <vscode.CodeLens[]>(
+        await vscode.commands.executeCommand(
+            'vscode.executeCodeLensProvider',
+            activeEditor.document.uri,
+            resolvedItemCount
+        )
+    );
+    return codeLenses.sort((a, b) => {
+        const rangeCompare = a.range.start.compareTo(b.range.start);
+        if (rangeCompare !== 0) {
+            return rangeCompare;
+        }
+
+        return a.command!.title.localeCompare(b.command!.command);
+    });
+}
diff --git a/test/razorIntegrationTests/formatting.integration.test.ts b/test/razorIntegrationTests/formatting.integration.test.ts
new file mode 100644
index 000000000..82deb14c0
--- /dev/null
+++ b/test/razorIntegrationTests/formatting.integration.test.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as jestLib from '@jest/globals';
+import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import * as integrationHelpers from '../integrationTests/integrationHelpers';
+
+function normalizeNewlines(original: string | undefined): string | undefined {
+    if (!original) {
+        return original;
+    }
+
+    while (original.indexOf('\r\n') != -1) {
+        original = original.replace('\r\n', '\n');
+    }
+
+    return original;
+}
+
+jestLib.describe(`Razor Formatting ${testAssetWorkspace.description}`, function () {
+    jestLib.beforeAll(async function () {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        const razorConfig = vscode.workspace.getConfiguration('razor');
+        await razorConfig.update('format.enable', true);
+        const htmlConfig = vscode.workspace.getConfiguration('html');
+        await htmlConfig.update('format.enable', true);
+
+        await integrationHelpers.openFileInWorkspaceAsync(path.join('Pages', 'BadlyFormatted.razor'));
+        await integrationHelpers.activateCSharpExtension();
+    });
+
+    jestLib.afterAll(async () => {
+        await testAssetWorkspace.cleanupWorkspace();
+    });
+
+    jestLib.test('Document formatted correctly', async () => {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        const activeDocument = vscode.window.activeTextEditor?.document.uri;
+        if (!activeDocument) {
+            throw new Error('No active document');
+        }
+
+        const edits = <vscode.TextEdit[]>await vscode.commands.executeCommand(
+            'vscode.executeFormatDocumentProvider',
+            activeDocument,
+            {
+                insertSpaces: true,
+                tabSize: 4,
+            }
+        );
+
+        jestLib.expect(edits).toBeDefined();
+
+        console.log(`Got ${edits.length} edits`);
+
+        // It's much easier to verify the expected state of the document, than a bunch of edits
+        const formatEdit = new vscode.WorkspaceEdit();
+        formatEdit.set(activeDocument, edits);
+
+        console.log(`Applying edit ${formatEdit}`);
+
+        await vscode.workspace.applyEdit(formatEdit);
+
+        const contents = normalizeNewlines(vscode.window.activeTextEditor?.document.getText());
+
+        console.log(`Checking document contents...`);
+
+        jestLib.expect(contents).toBe(
+            normalizeNewlines(`@page "/bad"
+
+@code {
+    private string _x = "";
+
+    private void M()
+    {
+        // hi there
+    }
+}
+`)
+        );
+    });
+});
diff --git a/test/razorIntegrationTests/index.ts b/test/razorIntegrationTests/index.ts
new file mode 100644
index 000000000..26731859a
--- /dev/null
+++ b/test/razorIntegrationTests/index.ts
@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { runIntegrationTests } from '../runIntegrationTests';
+import { jestIntegrationTestProjectName } from './jest.config';
+
+export async function run() {
+    process.env.RUNNING_INTEGRATION_TESTS = 'true';
+
+    await runIntegrationTests(jestIntegrationTestProjectName);
+}
diff --git a/test/razorIntegrationTests/jest.config.ts b/test/razorIntegrationTests/jest.config.ts
new file mode 100644
index 000000000..7157e8c75
--- /dev/null
+++ b/test/razorIntegrationTests/jest.config.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const jestIntegrationTestProjectName = 'Razor Integration Tests';
+
+/**
+ * Defines a project configuration for jest integration tests.
+ */
+const integrationTestConfig: Config = {
+    ...baseProjectConfig,
+    displayName: jestIntegrationTestProjectName,
+    roots: ['<rootDir>'],
+    testEnvironment: '<rootDir>/../integrationTests/jestSetup/vsCodeEnvironment.ts',
+    setupFilesAfterEnv: ['<rootDir>/../integrationTests/jestSetup/vsCodeFramework.ts'],
+};
+
+export default integrationTestConfig;
diff --git a/test/razorIntegrationTests/runIntegrationTests.ts b/test/razorIntegrationTests/runIntegrationTests.ts
new file mode 100644
index 000000000..2a0fb2901
--- /dev/null
+++ b/test/razorIntegrationTests/runIntegrationTests.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as runner from '../runIntegrationTests';
+
+runner.main();
diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace
similarity index 70%
rename from omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace
rename to test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace
index 644cf41f5..bc0225ed1 100644
--- a/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace
@@ -5,9 +5,10 @@
         }
     ],
     "settings": {
-        "dotnet.defaultSolution": "b_SecondInOrder_SlnFile.sln",
+        "dotnet.defaultSolution": "BasicRazorApp2_1.sln",
         "dotnet.server.trace": "Trace",
         "dotnet.server.useOmnisharp": false,
         "omnisharp.enableLspDriver": false,
+        "razor.trace": "Verbose"
     }
-}
\ No newline at end of file
+}
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj
new file mode 100644
index 000000000..92605c5a1
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.sln b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.sln
new file mode 100644
index 000000000..601d8885c
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/BasicRazorApp2_1.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicRazorApp2_1", "BasicRazorApp2_1.csproj", "{6311A302-9D48-4375-A137-85FF05AED7CF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6311A302-9D48-4375-A137-85FF05AED7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6311A302-9D48-4375-A137-85FF05AED7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6311A302-9D48-4375-A137-85FF05AED7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6311A302-9D48-4375-A137-85FF05AED7CF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/BadlyFormatted.razor b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/BadlyFormatted.razor
new file mode 100644
index 000000000..99ed1e246
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/BadlyFormatted.razor
@@ -0,0 +1,10 @@
+@page "/bad"
+
+@code {
+private                        string                    _x                           =                     "";
+
+private void M()
+{
+// hi there
+}
+}
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor
new file mode 100644
index 000000000..5515d836a
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/ErrorHaver.razor
@@ -0,0 +1,3 @@
+@page "/error"
+
+@DoesNotExist
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml
new file mode 100644
index 000000000..b7cc72c89
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Pages/Index.cshtml
@@ -0,0 +1,7 @@
+@page
+
+@{
+    var message = "Hello";
+}
+
+<h1>@(message)</h1>
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Program.cs b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Program.cs
new file mode 100644
index 000000000..2df85ca92
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BasicRazorApp2_1
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("This application is not intended to be run. It exists only for VS Code Razor Extension functional testing.");
+        }
+    }
+}
diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml
new file mode 100644
index 000000000..80fa54a30
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@inject DateTime TheTime
+
diff --git a/test/razorIntegrationTests/testAssets/NuGet.config b/test/razorIntegrationTests/testAssets/NuGet.config
new file mode 100644
index 000000000..8ff8c1454
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/NuGet.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- NuGet config for integration test projects.  Guards against a higher level NuGet.config from removing a required package source. -->
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
\ No newline at end of file
diff --git a/test/razorIntegrationTests/testAssets/basicRazorApp21.ts b/test/razorIntegrationTests/testAssets/basicRazorApp21.ts
new file mode 100644
index 000000000..51d51301d
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/basicRazorApp21.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITestAssetWorkspace } from '../../integrationTests/testAssets/testAssets';
+
+const workspace: ITestAssetWorkspace = {
+    description: 'Basic Razor app',
+    projects: [
+        {
+            relativeFilePath: 'BasicRazorApp2_1.csproj',
+        },
+    ],
+};
+
+export default workspace;
diff --git a/test/razorIntegrationTests/testAssets/testAssetWorkspace.ts b/test/razorIntegrationTests/testAssets/testAssetWorkspace.ts
new file mode 100644
index 000000000..c193e4468
--- /dev/null
+++ b/test/razorIntegrationTests/testAssets/testAssetWorkspace.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+
+import BasicRazorApp2_1 from './basicRazorApp21';
+import { ITestAssetWorkspace, TestAssetWorkspace } from '../../integrationTests/testAssets/testAssets';
+
+const testAssetWorkspaces: { [x: string]: ITestAssetWorkspace } = {
+    BasicRazorApp2_1,
+};
+
+const workspaceName = vscode.workspace.workspaceFolders![0].uri.fsPath.split(path.sep).pop();
+
+const activeTestAssetWorkspace = new TestAssetWorkspace(testAssetWorkspaces[workspaceName!]);
+
+export default activeTestAssetWorkspace;
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/README.md b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/README.md
new file mode 100644
index 000000000..056f0779b
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/README.md
@@ -0,0 +1,46 @@
+# VSCode TextMate Grammar Tests
+
+[Jest](https://jestjs.io/en) is used for VS Code TextMate Grammar unit tests.
+
+**Note:** There are [known issues](https://github.com/nodejs/node-gyp/blob/master/macOS_Catalina.md) with MacOS Catalina for certain dependencies. Windows works well.
+
+## Snapshot Tests
+
+[Jest Snapshot Tests](https://jestjs.io/docs/en/snapshot-testing) are utilized to test out the TextMate grammar in VS Code. As the name suggests, snapshot tests store a serialized _snapshot_ of the tokenized and parsed result of the grammar on a particular test string.
+
+### Running Snapshot Tests
+
+Run the following from the root of the repo:
+
+```bash
+npm run test:razor
+```
+
+### Directory Structure
+
+- `./tests`:
+  - Contains test suites for the various language structures.
+- `./tests/__snapshots__/grammarTests.test.ts.snap`:
+  - Is the `.snap` file which preserves the tokenized and parsed snapshot. Make sure to commit this file with your changes as it saves the expected state of the grammar.
+- `./tests/grammarTests.test.ts`:
+  - Is the main test wrapper. Once a new test suite is added, this wrapper must be updated to call the test suite.
+
+### Adding a Test Suite
+
+1. Add new test suite file in `./tests` (you can copy an existing test suite as a template).
+2. Update `./tests/grammarTests.test.ts` with the new test suite.
+3. In `testTasks.ts`, modify `runJestTest`'s call to `jest.runCLI` function to include `updateSnapshot: true`. Afterwards, run `npm run test:razor`.
+
+### Adding / Updating a Test in an Existing Test Suite
+
+1. Ensure the grammar is functioning as expected visually using a test string within a `.cshtml` / `.razor` file.
+1. Add the test string to the test suite using the form:
+
+   ```typescript
+   it('[Test Name]', async () => {
+      await assertMatchesSnapshot('[Test String]');
+   });
+   ```
+
+1. Follow step 3 of the previous section to serialize the tokensized and parsed representation of the test string. This frozen state will be treated as the "source of truth" for future executions of the test suite, in order to identify regressions.
+1. Ensure the `./tests/__snapshots__/grammarTests.test.ts.snap` file is commited with your changes.
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/JavaScript.tmLanguage.json b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/JavaScript.tmLanguage.json
new file mode 100644
index 000000000..2213fe2de
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/JavaScript.tmLanguage.json
@@ -0,0 +1,5989 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/microsoft/TypeScript-TmLanguage/blob/master/TypeScriptReact.tmLanguage",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747",
+	"name": "JavaScript (with React support)",
+	"scopeName": "source.js",
+	"patterns": [
+		{
+			"include": "#directives"
+		},
+		{
+			"include": "#statements"
+		},
+		{
+			"include": "#shebang"
+		}
+	],
+	"repository": {
+		"shebang": {
+			"name": "comment.line.shebang.js",
+			"match": "\\A(#!).*(?=$)",
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.comment.js"
+				}
+			}
+		},
+		"statements": {
+			"patterns": [
+				{
+					"include": "#declaration"
+				},
+				{
+					"include": "#control-statement"
+				},
+				{
+					"include": "#after-operator-block-as-object-literal"
+				},
+				{
+					"include": "#decl-block"
+				},
+				{
+					"include": "#label"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"declaration": {
+			"patterns": [
+				{
+					"include": "#decorator"
+				},
+				{
+					"include": "#var-expr"
+				},
+				{
+					"include": "#function-declaration"
+				},
+				{
+					"include": "#class-declaration"
+				},
+				{
+					"include": "#interface-declaration"
+				},
+				{
+					"include": "#enum-declaration"
+				},
+				{
+					"include": "#namespace-declaration"
+				},
+				{
+					"include": "#type-alias-declaration"
+				},
+				{
+					"include": "#import-equals-declaration"
+				},
+				{
+					"include": "#import-declaration"
+				},
+				{
+					"include": "#export-declaration"
+				},
+				{
+					"name": "storage.modifier.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare|export)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				}
+			]
+		},
+		"control-statement": {
+			"patterns": [
+				{
+					"include": "#switch-statement"
+				},
+				{
+					"include": "#for-loop"
+				},
+				{
+					"name": "keyword.control.trycatch.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(catch|finally|throw|try)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(break|continue|goto)\\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"captures": {
+						"1": {
+							"name": "keyword.control.loop.js"
+						},
+						"2": {
+							"name": "entity.name.label.js"
+						}
+					}
+				},
+				{
+					"name": "keyword.control.loop.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(break|continue|do|goto|while)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(return)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.flow.js"
+						}
+					},
+					"end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"name": "keyword.control.switch.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(case|default|switch)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"include": "#if-statement"
+				},
+				{
+					"name": "keyword.control.conditional.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(else|if)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.control.with.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(with)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.control.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(package)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.other.debugger.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				}
+			]
+		},
+		"label": {
+			"patterns": [
+				{
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.label.js"
+						},
+						"2": {
+							"name": "punctuation.separator.label.js"
+						}
+					},
+					"end": "(?<=\\})",
+					"patterns": [
+						{
+							"include": "#decl-block"
+						}
+					]
+				},
+				{
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.label.js"
+						},
+						"2": {
+							"name": "punctuation.separator.label.js"
+						}
+					}
+				}
+			]
+		},
+		"expression": {
+			"patterns": [
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"include": "#identifiers"
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
+		"expressionWithoutIdentifiers": {
+			"patterns": [
+				{
+					"include": "#jsx"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#regex"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#function-expression"
+				},
+				{
+					"include": "#class-expression"
+				},
+				{
+					"include": "#arrow-function"
+				},
+				{
+					"include": "#paren-expression-possibly-arrow"
+				},
+				{
+					"include": "#cast"
+				},
+				{
+					"include": "#ternary-expression"
+				},
+				{
+					"include": "#new-expr"
+				},
+				{
+					"include": "#instanceof-expr"
+				},
+				{
+					"include": "#object-literal"
+				},
+				{
+					"include": "#expression-operators"
+				},
+				{
+					"include": "#function-call"
+				},
+				{
+					"include": "#literal"
+				},
+				{
+					"include": "#support-objects"
+				},
+				{
+					"include": "#paren-expression"
+				}
+			]
+		},
+		"expressionPunctuations": {
+			"patterns": [
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#punctuation-accessor"
+				}
+			]
+		},
+		"decorator": {
+			"name": "meta.decorator.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.decorator.js"
+				}
+			},
+			"end": "(?=\\s)",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"var-expr": {
+			"patterns": [
+				{
+					"name": "meta.var.expr.js",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js"
+								},
+								"2": {
+									"name": "storage.modifier.js"
+								},
+								"3": {
+									"name": "storage.type.js"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#destructuring-variable"
+						},
+						{
+							"include": "#var-single-variable"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*(?=$|\\/\\/)",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-variable"
+								},
+								{
+									"include": "#var-single-variable"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				},
+				{
+					"name": "meta.var.expr.js",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "storage.type.js"
+						}
+					},
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js"
+								},
+								"2": {
+									"name": "storage.modifier.js"
+								},
+								"3": {
+									"name": "storage.type.js"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#destructuring-const"
+						},
+						{
+							"include": "#var-single-const"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*(?=$|\\/\\/)",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-const"
+								},
+								{
+									"include": "#var-single-const"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				},
+				{
+					"name": "meta.var.expr.js",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "storage.type.js"
+						}
+					},
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^using|[^\\._$[:alnum:]]using|^await\\s+using|[^\\._$[:alnum:]]await\\s+using)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js"
+								},
+								"2": {
+									"name": "storage.modifier.js"
+								},
+								"3": {
+									"name": "storage.type.js"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#var-single-const"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#var-single-const"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
+		},
+		"var-single-variable": {
+			"patterns": [
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js entity.name.function.js"
+						},
+						"2": {
+							"name": "keyword.operator.definiteassignment.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\\!)?",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js variable.other.constant.js"
+						},
+						"2": {
+							"name": "keyword.operator.definiteassignment.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js variable.other.readwrite.js"
+						},
+						"2": {
+							"name": "keyword.operator.definiteassignment.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				}
+			]
+		},
+		"var-single-const": {
+			"patterns": [
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js variable.other.constant.js entity.name.function.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js variable.other.constant.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				}
+			]
+		},
+		"var-single-variable-type-annotation": {
+			"patterns": [
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"destructuring-variable": {
+			"patterns": [
+				{
+					"name": "meta.object-binding-pattern-variable.js",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#object-binding-pattern"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"name": "meta.array-binding-pattern-variable.js",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#array-binding-pattern"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				}
+			]
+		},
+		"destructuring-const": {
+			"patterns": [
+				{
+					"name": "meta.object-binding-pattern-variable.js",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#object-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"name": "meta.array-binding-pattern-variable.js",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+					"end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#array-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				}
+			]
+		},
+		"object-binding-element": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#binding-element"
+						}
+					]
+				},
+				{
+					"include": "#object-binding-pattern"
+				},
+				{
+					"include": "#destructuring-variable-rest"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"object-binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#binding-element-const"
+						}
+					]
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"object-binding-element-propertyName": {
+			"begin": "(?x)(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+			"end": "(:)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.destructuring.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"name": "variable.object.property.js",
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+				}
+			]
+		},
+		"binding-element": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#regex"
+				},
+				{
+					"include": "#object-binding-pattern"
+				},
+				{
+					"include": "#array-binding-pattern"
+				},
+				{
+					"include": "#destructuring-variable-rest"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#regex"
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#array-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"destructuring-variable-rest": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "meta.definition.variable.js variable.other.readwrite.js"
+				}
+			}
+		},
+		"destructuring-variable-rest-const": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "meta.definition.variable.js variable.other.constant.js"
+				}
+			}
+		},
+		"object-binding-pattern": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-binding-element"
+				}
+			]
+		},
+		"object-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-binding-element-const"
+				}
+			]
+		},
+		"array-binding-pattern": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#binding-element"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"array-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#binding-element-const"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"parameter-name": {
+			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|protected|private|readonly)\\s+(?=(override|public|protected|private|readonly)\\s+)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "entity.name.function.js variable.language.this.js"
+						},
+						"4": {
+							"name": "entity.name.function.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "variable.parameter.js variable.language.this.js"
+						},
+						"4": {
+							"name": "variable.parameter.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				}
+			]
+		},
+		"destructuring-parameter": {
+			"patterns": [
+				{
+					"name": "meta.parameter.object-binding-pattern.js",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.rest.js"
+						},
+						"2": {
+							"name": "punctuation.definition.binding-pattern.object.js"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.binding-pattern.object.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#parameter-object-binding-element"
+						}
+					]
+				},
+				{
+					"name": "meta.paramter.array-binding-pattern.js",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.rest.js"
+						},
+						"2": {
+							"name": "punctuation.definition.binding-pattern.array.js"
+						}
+					},
+					"end": "\\]",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.binding-pattern.array.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#parameter-binding-element"
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
+		},
+		"parameter-object-binding-element": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#parameter-binding-element"
+						},
+						{
+							"include": "#paren-expression"
+						}
+					]
+				},
+				{
+					"include": "#parameter-object-binding-pattern"
+				},
+				{
+					"include": "#destructuring-parameter-rest"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"parameter-binding-element": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#regex"
+				},
+				{
+					"include": "#parameter-object-binding-pattern"
+				},
+				{
+					"include": "#parameter-array-binding-pattern"
+				},
+				{
+					"include": "#destructuring-parameter-rest"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"destructuring-parameter-rest": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "variable.parameter.js"
+				}
+			}
+		},
+		"parameter-object-binding-pattern": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#parameter-object-binding-element"
+				}
+			]
+		},
+		"parameter-array-binding-pattern": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#parameter-binding-element"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"field-declaration": {
+			"name": "meta.field.declaration.js",
+			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|\\}|$))",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.js"
+				}
+			},
+			"end": "(?x)(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|$))))|(?<=\\})",
+			"patterns": [
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "meta.definition.property.js entity.name.function.js"
+						},
+						"2": {
+							"name": "keyword.operator.optional.js"
+						},
+						"3": {
+							"name": "keyword.operator.definiteassignment.js"
+						}
+					}
+				},
+				{
+					"name": "meta.definition.property.js variable.object.property.js",
+					"match": "\\#?[_$[:alpha:]][_$[:alnum:]]*"
+				},
+				{
+					"name": "keyword.operator.optional.js",
+					"match": "\\?"
+				},
+				{
+					"name": "keyword.operator.definiteassignment.js",
+					"match": "\\!"
+				}
+			]
+		},
+		"variable-initializer": {
+			"patterns": [
+				{
+					"begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.js"
+						}
+					},
+					"end": "(?=$|^|[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"begin": "(?<!=|!)(=)(?!=)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.js"
+						}
+					},
+					"end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				}
+			]
+		},
+		"function-declaration": {
+			"name": "meta.function.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.modifier.async.js"
+				},
+				"4": {
+					"name": "storage.type.function.js"
+				},
+				"5": {
+					"name": "keyword.generator.asterisk.js"
+				},
+				"6": {
+					"name": "meta.definition.function.js entity.name.function.js"
+				}
+			},
+			"end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|(?<=\\})",
+			"patterns": [
+				{
+					"include": "#function-name"
+				},
+				{
+					"include": "#function-body"
+				}
+			]
+		},
+		"function-expression": {
+			"name": "meta.function.expression.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.async.js"
+				},
+				"2": {
+					"name": "storage.type.function.js"
+				},
+				"3": {
+					"name": "keyword.generator.asterisk.js"
+				},
+				"4": {
+					"name": "meta.definition.function.js entity.name.function.js"
+				}
+			},
+			"end": "(?=;)|(?<=\\})",
+			"patterns": [
+				{
+					"include": "#function-name"
+				},
+				{
+					"include": "#single-line-comment-consuming-line-ending"
+				},
+				{
+					"include": "#function-body"
+				}
+			]
+		},
+		"function-name": {
+			"name": "meta.definition.function.js entity.name.function.js",
+			"match": "[_$[:alpha:]][_$[:alnum:]]*"
+		},
+		"function-body": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"include": "#function-parameters"
+				},
+				{
+					"include": "#return-type"
+				},
+				{
+					"include": "#type-function-return-type"
+				},
+				{
+					"include": "#decl-block"
+				},
+				{
+					"name": "keyword.generator.asterisk.js",
+					"match": "\\*"
+				}
+			]
+		},
+		"method-declaration": {
+			"patterns": [
+				{
+					"name": "meta.method.declaration.js",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "storage.modifier.js"
+						},
+						"4": {
+							"name": "storage.modifier.async.js"
+						},
+						"5": {
+							"name": "storage.type.js"
+						}
+					},
+					"end": "(?=\\}|;|,|$)|(?<=\\})",
+					"patterns": [
+						{
+							"include": "#method-declaration-name"
+						},
+						{
+							"include": "#function-body"
+						}
+					]
+				},
+				{
+					"name": "meta.method.declaration.js",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "storage.modifier.js"
+						},
+						"4": {
+							"name": "storage.modifier.async.js"
+						},
+						"5": {
+							"name": "keyword.operator.new.js"
+						},
+						"6": {
+							"name": "keyword.generator.asterisk.js"
+						}
+					},
+					"end": "(?=\\}|;|,|$)|(?<=\\})",
+					"patterns": [
+						{
+							"include": "#method-declaration-name"
+						},
+						{
+							"include": "#function-body"
+						}
+					]
+				},
+				{
+					"name": "meta.method.declaration.js",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "storage.modifier.js"
+						},
+						"4": {
+							"name": "storage.modifier.async.js"
+						},
+						"5": {
+							"name": "storage.type.property.js"
+						},
+						"6": {
+							"name": "keyword.generator.asterisk.js"
+						}
+					},
+					"end": "(?=\\}|;|,|$)|(?<=\\})",
+					"patterns": [
+						{
+							"include": "#method-declaration-name"
+						},
+						{
+							"include": "#function-body"
+						}
+					]
+				}
+			]
+		},
+		"object-literal-method-declaration": {
+			"name": "meta.method.declaration.js",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.async.js"
+				},
+				"2": {
+					"name": "storage.type.property.js"
+				},
+				"3": {
+					"name": "keyword.generator.asterisk.js"
+				}
+			},
+			"end": "(?=\\}|;|,)|(?<=\\})",
+			"patterns": [
+				{
+					"include": "#method-declaration-name"
+				},
+				{
+					"include": "#function-body"
+				},
+				{
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						},
+						"2": {
+							"name": "storage.type.property.js"
+						},
+						"3": {
+							"name": "keyword.generator.asterisk.js"
+						}
+					},
+					"end": "(?=\\(|\\<)",
+					"patterns": [
+						{
+							"include": "#method-declaration-name"
+						}
+					]
+				}
+			]
+		},
+		"method-declaration-name": {
+			"begin": "(?x)(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
+			"end": "(?=\\(|\\<)",
+			"patterns": [
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"name": "meta.definition.method.js entity.name.function.js",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				},
+				{
+					"name": "keyword.operator.optional.js",
+					"match": "\\?"
+				}
+			]
+		},
+		"arrow-function": {
+			"patterns": [
+				{
+					"name": "meta.arrow.js",
+					"match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\\s+)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?==>)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						},
+						"2": {
+							"name": "variable.parameter.js"
+						}
+					}
+				},
+				{
+					"name": "meta.arrow.js",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						}
+					},
+					"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-parameters"
+						},
+						{
+							"include": "#function-parameters"
+						},
+						{
+							"include": "#arrow-return-type"
+						},
+						{
+							"include": "#possibly-arrow-return-type"
+						}
+					]
+				},
+				{
+					"name": "meta.arrow.js",
+					"begin": "=>",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.function.arrow.js"
+						}
+					},
+					"end": "((?<=\\}|\\S)(?<!=>)|((?!\\{)(?=\\S)))(?!\\/[\\/\\*])",
+					"patterns": [
+						{
+							"include": "#single-line-comment-consuming-line-ending"
+						},
+						{
+							"include": "#decl-block"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				}
+			]
+		},
+		"indexer-declaration": {
+			"name": "meta.indexer.declaration.js",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.js"
+				},
+				"2": {
+					"name": "meta.brace.square.js"
+				},
+				"3": {
+					"name": "variable.parameter.js"
+				}
+			},
+			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"endCaptures": {
+				"1": {
+					"name": "meta.brace.square.js"
+				},
+				"2": {
+					"name": "keyword.operator.optional.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type-annotation"
+				}
+			]
+		},
+		"indexer-mapped-type-declaration": {
+			"name": "meta.indexer.mappedtype.declaration.js",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.type.modifier.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "meta.brace.square.js"
+				},
+				"4": {
+					"name": "entity.name.type.js"
+				},
+				"5": {
+					"name": "keyword.operator.expression.in.js"
+				}
+			},
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
+			"endCaptures": {
+				"1": {
+					"name": "meta.brace.square.js"
+				},
+				"2": {
+					"name": "keyword.operator.type.modifier.js"
+				},
+				"3": {
+					"name": "keyword.operator.optional.js"
+				}
+			},
+			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.js"
+						}
+					}
+				},
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"function-parameters": {
+			"name": "meta.parameters.js",
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.parameters.begin.js"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.parameters.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#function-parameters-body"
+				}
+			]
+		},
+		"function-parameters-body": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#decorator"
+				},
+				{
+					"include": "#destructuring-parameter"
+				},
+				{
+					"include": "#parameter-name"
+				},
+				{
+					"include": "#parameter-type-annotation"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"name": "punctuation.separator.parameter.js",
+					"match": ","
+				}
+			]
+		},
+		"class-declaration": {
+			"name": "meta.class.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.modifier.js"
+				},
+				"4": {
+					"name": "storage.type.class.js"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#class-declaration-or-expression-patterns"
+				}
+			]
+		},
+		"class-expression": {
+			"name": "meta.class.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|\\/[\\/*])",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.js"
+				},
+				"2": {
+					"name": "storage.type.class.js"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#class-declaration-or-expression-patterns"
+				}
+			]
+		},
+		"class-declaration-or-expression-patterns": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#class-or-interface-heritage"
+				},
+				{
+					"match": "[_$[:alpha:]][_$[:alnum:]]*",
+					"captures": {
+						"0": {
+							"name": "entity.name.type.class.js"
+						}
+					}
+				},
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"include": "#class-or-interface-body"
+				}
+			]
+		},
+		"interface-declaration": {
+			"name": "meta.interface.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.modifier.js"
+				},
+				"4": {
+					"name": "storage.type.interface.js"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#class-or-interface-heritage"
+				},
+				{
+					"match": "[_$[:alpha:]][_$[:alnum:]]*",
+					"captures": {
+						"0": {
+							"name": "entity.name.type.interface.js"
+						}
+					}
+				},
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"include": "#class-or-interface-body"
+				}
+			]
+		},
+		"class-or-interface-heritage": {
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(extends|implements)\\b)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.js"
+				}
+			},
+			"end": "(?=\\{)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#class-or-interface-heritage"
+				},
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.module.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.js"
+						},
+						"3": {
+							"name": "punctuation.accessor.optional.js"
+						}
+					}
+				},
+				{
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "entity.other.inherited-class.js"
+						}
+					}
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
+		"class-or-interface-body": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#decorator"
+				},
+				{
+					"begin": "(?<=:)\\s*",
+					"end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#method-declaration"
+				},
+				{
+					"include": "#indexer-declaration"
+				},
+				{
+					"include": "#field-declaration"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#access-modifier"
+				},
+				{
+					"include": "#property-accessor"
+				},
+				{
+					"include": "#async-modifier"
+				},
+				{
+					"include": "#after-operator-block-as-object-literal"
+				},
+				{
+					"include": "#decl-block"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"access-modifier": {
+			"name": "storage.modifier.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(abstract|declare|override|public|protected|private|readonly|static)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"property-accessor": {
+			"name": "storage.type.property.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"async-modifier": {
+			"name": "storage.modifier.async.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(async)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"enum-declaration": {
+			"name": "meta.enum.declaration.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.modifier.js"
+				},
+				"4": {
+					"name": "storage.type.enum.js"
+				},
+				"5": {
+					"name": "entity.name.type.enum.js"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.other.enummember.js"
+								}
+							},
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#string"
+								},
+								{
+									"include": "#array-literal"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
+		},
+		"namespace-declaration": {
+			"name": "meta.namespace.declaration.js",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.type.namespace.js"
+				}
+			},
+			"end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"name": "entity.name.type.module.js",
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+				},
+				{
+					"include": "#punctuation-accessor"
+				},
+				{
+					"include": "#decl-block"
+				}
+			]
+		},
+		"type-alias-declaration": {
+			"name": "meta.type.declaration.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.type.type.js"
+				},
+				"4": {
+					"name": "entity.name.type.alias.js"
+				}
+			},
+			"end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"begin": "(=)\\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.js"
+						},
+						"2": {
+							"name": "keyword.control.intrinsic.js"
+						}
+					},
+					"end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				{
+					"begin": "(=)\\s*",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.js"
+						}
+					},
+					"end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			]
+		},
+		"import-equals-declaration": {
+			"patterns": [
+				{
+					"name": "meta.import-equals.external.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type))?\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "keyword.control.import.js"
+						},
+						"4": {
+							"name": "keyword.control.type.js"
+						},
+						"5": {
+							"name": "variable.other.readwrite.alias.js"
+						},
+						"6": {
+							"name": "keyword.operator.assignment.js"
+						},
+						"7": {
+							"name": "keyword.control.require.js"
+						},
+						"8": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#string"
+						}
+					]
+				},
+				{
+					"name": "meta.import-equals.internal.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type))?\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "keyword.control.import.js"
+						},
+						"4": {
+							"name": "keyword.control.type.js"
+						},
+						"5": {
+							"name": "variable.other.readwrite.alias.js"
+						},
+						"6": {
+							"name": "keyword.operator.assignment.js"
+						}
+					},
+					"end": "(?=;|$|^)",
+					"patterns": [
+						{
+							"include": "#single-line-comment-consuming-line-ending"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))",
+							"captures": {
+								"1": {
+									"name": "entity.name.type.module.js"
+								},
+								"2": {
+									"name": "punctuation.accessor.js"
+								},
+								"3": {
+									"name": "punctuation.accessor.optional.js"
+								}
+							}
+						},
+						{
+							"name": "variable.other.readwrite.js",
+							"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+						}
+					]
+				}
+			]
+		},
+		"import-declaration": {
+			"name": "meta.import.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "keyword.control.import.js"
+				},
+				"4": {
+					"name": "keyword.control.type.js"
+				}
+			},
+			"end": "(?<!^import|[^\\._$[:alnum:]]import)(?=;|$|^)",
+			"patterns": [
+				{
+					"include": "#single-line-comment-consuming-line-ending"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"begin": "(?<=^import|[^\\._$[:alnum:]]import)(?!\\s*[\"'])",
+					"end": "\\bfrom\\b",
+					"endCaptures": {
+						"0": {
+							"name": "keyword.control.from.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#import-export-declaration"
+						}
+					]
+				},
+				{
+					"include": "#import-export-declaration"
+				}
+			]
+		},
+		"export-declaration": {
+			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "keyword.control.as.js"
+						},
+						"3": {
+							"name": "storage.type.namespace.js"
+						},
+						"4": {
+							"name": "entity.name.type.module.js"
+						}
+					}
+				},
+				{
+					"name": "meta.export.default.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "keyword.control.type.js"
+						},
+						"3": {
+							"name": "keyword.operator.assignment.js"
+						},
+						"4": {
+							"name": "keyword.control.default.js"
+						}
+					},
+					"end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+					"patterns": [
+						{
+							"include": "#interface-declaration"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"name": "meta.export.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "keyword.control.type.js"
+						}
+					},
+					"end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+					"patterns": [
+						{
+							"include": "#import-export-declaration"
+						}
+					]
+				}
+			]
+		},
+		"import-export-declaration": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#import-export-block"
+				},
+				{
+					"name": "keyword.control.from.js",
+					"match": "\\bfrom\\b"
+				},
+				{
+					"include": "#import-export-assert-clause"
+				},
+				{
+					"include": "#import-export-clause"
+				}
+			]
+		},
+		"import-export-assert-clause": {
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(assert)\\s*(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.assert.js"
+				},
+				"2": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"name": "meta.object-literal.key.js",
+					"match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)"
+				},
+				{
+					"name": "punctuation.separator.key-value.js",
+					"match": ":"
+				}
+			]
+		},
+		"import-export-block": {
+			"name": "meta.block.js",
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#import-export-clause"
+				}
+			]
+		},
+		"import-export-clause": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*))",
+					"captures": {
+						"1": {
+							"name": "keyword.control.type.js"
+						},
+						"2": {
+							"name": "keyword.control.default.js"
+						},
+						"3": {
+							"name": "constant.language.import-export-all.js"
+						},
+						"4": {
+							"name": "variable.other.readwrite.js"
+						},
+						"5": {
+							"name": "keyword.control.as.js"
+						},
+						"6": {
+							"name": "keyword.control.default.js"
+						},
+						"7": {
+							"name": "variable.other.readwrite.alias.js"
+						}
+					}
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"name": "constant.language.import-export-all.js",
+					"match": "\\*"
+				},
+				{
+					"name": "keyword.control.default.js",
+					"match": "\\b(default)\\b"
+				},
+				{
+					"match": "(?:(\\btype)\\s+)?([_$[:alpha:]][_$[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "keyword.control.type.js"
+						},
+						"2": {
+							"name": "variable.other.readwrite.alias.js"
+						}
+					}
+				}
+			]
+		},
+		"switch-statement": {
+			"name": "switch-statement.expr.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bswitch\\s*\\()",
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"name": "switch-expression.expr.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(switch)\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.switch.js"
+						},
+						"2": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"name": "switch-block.expr.js",
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"end": "(?=\\})",
+					"patterns": [
+						{
+							"name": "case-clause.expr.js",
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(case|default(?=:))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.switch.js"
+								}
+							},
+							"end": "(?=:)",
+							"patterns": [
+								{
+									"include": "#expression"
+								}
+							]
+						},
+						{
+							"begin": "(:)\\s*(\\{)",
+							"beginCaptures": {
+								"1": {
+									"name": "case-clause.expr.js punctuation.definition.section.case-statement.js"
+								},
+								"2": {
+									"name": "meta.block.js punctuation.definition.block.js"
+								}
+							},
+							"end": "\\}",
+							"endCaptures": {
+								"0": {
+									"name": "meta.block.js punctuation.definition.block.js"
+								}
+							},
+							"contentName": "meta.block.js",
+							"patterns": [
+								{
+									"include": "#statements"
+								}
+							]
+						},
+						{
+							"match": "(:)",
+							"captures": {
+								"0": {
+									"name": "case-clause.expr.js punctuation.definition.section.case-statement.js"
+								}
+							}
+						},
+						{
+							"include": "#statements"
+						}
+					]
+				}
+			]
+		},
+		"for-loop": {
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*))await)?\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)?(\\())",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.control.loop.js"
+				}
+			},
+			"end": "(?<=\\))",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"name": "keyword.control.loop.js",
+					"match": "await"
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#var-expr"
+						},
+						{
+							"include": "#expression"
+						},
+						{
+							"include": "#punctuation-semicolon"
+						}
+					]
+				}
+			]
+		},
+		"if-statement": {
+			"patterns": [
+				{
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
+					"end": "(?=;|$|\\})",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(if)\\s*(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.conditional.js"
+								},
+								"2": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression"
+								}
+							]
+						},
+						{
+							"name": "string.regexp.js",
+							"begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.js"
+								}
+							},
+							"end": "(/)([dgimsuy]*)",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.definition.string.end.js"
+								},
+								"2": {
+									"name": "keyword.other.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#regexp"
+								}
+							]
+						},
+						{
+							"include": "#statements"
+						}
+					]
+				}
+			]
+		},
+		"decl-block": {
+			"name": "meta.block.js",
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#statements"
+				}
+			]
+		},
+		"after-operator-block-as-object-literal": {
+			"name": "meta.objectliteral.js",
+			"begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-member"
+				}
+			]
+		},
+		"object-literal": {
+			"name": "meta.objectliteral.js",
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-member"
+				}
+			]
+		},
+		"object-member": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#object-literal-method-declaration"
+				},
+				{
+					"name": "meta.object.member.js meta.object-literal.key.js",
+					"begin": "(?=\\[)",
+					"end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#array-literal"
+						}
+					]
+				},
+				{
+					"name": "meta.object.member.js meta.object-literal.key.js",
+					"begin": "(?=[\\'\\\"\\`])",
+					"end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#string"
+						}
+					]
+				},
+				{
+					"name": "meta.object.member.js meta.object-literal.key.js",
+					"begin": "(?x)(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$)))",
+					"end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as|satisifies\\s+))",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#numeric-literal"
+						}
+					]
+				},
+				{
+					"name": "meta.method.declaration.js",
+					"begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
+					"end": "(?=\\}|;|,)|(?<=\\})",
+					"patterns": [
+						{
+							"include": "#function-body"
+						}
+					]
+				},
+				{
+					"name": "meta.object.member.js",
+					"match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+					"captures": {
+						"0": {
+							"name": "meta.object-literal.key.js"
+						},
+						"1": {
+							"name": "constant.numeric.decimal.js"
+						}
+					}
+				},
+				{
+					"name": "meta.object.member.js",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"0": {
+							"name": "meta.object-literal.key.js"
+						},
+						"1": {
+							"name": "entity.name.function.js"
+						}
+					}
+				},
+				{
+					"name": "meta.object.member.js",
+					"match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+					"captures": {
+						"0": {
+							"name": "meta.object-literal.key.js"
+						}
+					}
+				},
+				{
+					"name": "meta.object.member.js",
+					"begin": "\\.\\.\\.",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.spread.js"
+						}
+					},
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"name": "meta.object.member.js",
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+					"captures": {
+						"1": {
+							"name": "variable.other.readwrite.js"
+						}
+					}
+				},
+				{
+					"name": "meta.object.member.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+(const)(?=\\s*([,}]|$))",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						}
+					}
+				},
+				{
+					"name": "meta.object.member.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(as)|(satisfies))\\s+",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.as.js"
+						},
+						"2": {
+							"name": "keyword.control.satisfies.js"
+						}
+					},
+					"end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				{
+					"name": "meta.object.member.js",
+					"begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
+					"end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"name": "meta.object.member.js",
+					"begin": ":",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.object-literal.key.js punctuation.separator.key-value.js"
+						}
+					},
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js"
+								}
+							},
+							"end": "(?<=\\))",
+							"patterns": [
+								{
+									"include": "#type-parameters"
+								},
+								{
+									"begin": "\\(",
+									"beginCaptures": {
+										"0": {
+											"name": "meta.brace.round.js"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "meta.brace.round.js"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#expression-inside-possibly-arrow-parens"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js"
+								},
+								"2": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						},
+						{
+							"begin": "(?<=:)\\s*(async)?\\s*(?=\\<\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js"
+								}
+							},
+							"end": "(?<=\\>)",
+							"patterns": [
+								{
+									"include": "#type-parameters"
+								}
+							]
+						},
+						{
+							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"beginCaptures": {
+								"1": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						},
+						{
+							"include": "#possibly-arrow-return-type"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#decl-block"
+				}
+			]
+		},
+		"ternary-expression": {
+			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.ternary.js"
+				}
+			},
+			"end": "\\s*(:)",
+			"endCaptures": {
+				"1": {
+					"name": "keyword.operator.ternary.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"function-call": {
+			"patterns": [
+				{
+					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"patterns": [
+						{
+							"name": "meta.function-call.js",
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+							"patterns": [
+								{
+									"include": "#function-call-target"
+								}
+							]
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#function-call-optionals"
+						},
+						{
+							"include": "#type-arguments"
+						},
+						{
+							"include": "#paren-expression"
+						}
+					]
+				},
+				{
+					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+					"end": "(?<=\\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+					"patterns": [
+						{
+							"name": "meta.function-call.js",
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=(<\\s*[\\{\\[\\(]\\s*$))",
+							"patterns": [
+								{
+									"include": "#function-call-target"
+								}
+							]
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#function-call-optionals"
+						},
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			]
+		},
+		"function-call-target": {
+			"patterns": [
+				{
+					"include": "#support-function-call-identifiers"
+				},
+				{
+					"name": "entity.name.function.js",
+					"match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+				}
+			]
+		},
+		"function-call-optionals": {
+			"patterns": [
+				{
+					"name": "meta.function-call.js punctuation.accessor.optional.js",
+					"match": "\\?\\."
+				},
+				{
+					"name": "meta.function-call.js keyword.operator.definiteassignment.js",
+					"match": "\\!"
+				}
+			]
+		},
+		"support-function-call-identifiers": {
+			"patterns": [
+				{
+					"include": "#literal"
+				},
+				{
+					"include": "#support-objects"
+				},
+				{
+					"include": "#object-identifiers"
+				},
+				{
+					"include": "#punctuation-accessor"
+				},
+				{
+					"name": "keyword.operator.expression.import.js",
+					"match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*[\\(]\\s*[\\\"\\'\\`]))"
+				}
+			]
+		},
+		"new-expr": {
+			"name": "new.expr.js",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.new.js"
+				}
+			},
+			"end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"instanceof-expr": {
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(instanceof)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.expression.instanceof.js"
+				}
+			},
+			"end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"paren-expression-possibly-arrow": {
+			"patterns": [
+				{
+					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#paren-expression-possibly-arrow-with-typeparameters"
+						}
+					]
+				},
+				{
+					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#paren-expression-possibly-arrow-with-typeparameters"
+						}
+					]
+				},
+				{
+					"include": "#possibly-arrow-return-type"
+				}
+			]
+		},
+		"paren-expression-possibly-arrow-with-typeparameters": {
+			"patterns": [
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression-inside-possibly-arrow-parens"
+						}
+					]
+				}
+			]
+		},
+		"expression-inside-possibly-arrow-parens": {
+			"patterns": [
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#decorator"
+				},
+				{
+					"include": "#destructuring-parameter"
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|protected|private|readonly)\\s+(?=(override|public|protected|private|readonly)\\s+)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "entity.name.function.js variable.language.this.js"
+						},
+						"4": {
+							"name": "entity.name.function.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "variable.parameter.js variable.language.this.js"
+						},
+						"4": {
+							"name": "variable.parameter.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"name": "punctuation.separator.parameter.js",
+					"match": ","
+				},
+				{
+					"include": "#identifiers"
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
+		"paren-expression": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.brace.round.js"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.brace.round.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"cast": {
+			"patterns": [
+				{
+					"include": "#jsx"
+				}
+			]
+		},
+		"expression-operators": {
+			"patterns": [
+				{
+					"name": "keyword.control.flow.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(await)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*\\*)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.js"
+						}
+					},
+					"end": "\\*",
+					"endCaptures": {
+						"0": {
+							"name": "keyword.generator.asterisk.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?:\\s*(\\*))?",
+					"captures": {
+						"1": {
+							"name": "keyword.control.flow.js"
+						},
+						"2": {
+							"name": "keyword.generator.asterisk.js"
+						}
+					}
+				},
+				{
+					"name": "keyword.operator.expression.delete.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))delete(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.operator.expression.in.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
+				},
+				{
+					"name": "keyword.operator.expression.of.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
+				},
+				{
+					"name": "keyword.operator.expression.instanceof.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.operator.new.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"include": "#typeof-operator"
+				},
+				{
+					"name": "keyword.operator.expression.void.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))void(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+(const)(?=\\s*($|[;,:})\\]]))",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						}
+					}
+				},
+				{
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(as)|(satisfies))\\s+",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.as.js"
+						},
+						"2": {
+							"name": "keyword.control.satisfies.js"
+						}
+					},
+					"end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				{
+					"name": "keyword.operator.spread.js",
+					"match": "\\.\\.\\."
+				},
+				{
+					"name": "keyword.operator.assignment.compound.js",
+					"match": "\\*=|(?<!\\()/=|%=|\\+=|\\-="
+				},
+				{
+					"name": "keyword.operator.assignment.compound.bitwise.js",
+					"match": "\\&=|\\^=|<<=|>>=|>>>=|\\|="
+				},
+				{
+					"name": "keyword.operator.bitwise.shift.js",
+					"match": "<<|>>>|>>"
+				},
+				{
+					"name": "keyword.operator.comparison.js",
+					"match": "===|!==|==|!="
+				},
+				{
+					"name": "keyword.operator.relational.js",
+					"match": "<=|>=|<>|<|>"
+				},
+				{
+					"match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.logical.js"
+						},
+						"2": {
+							"name": "keyword.operator.assignment.compound.js"
+						},
+						"3": {
+							"name": "keyword.operator.arithmetic.js"
+						}
+					}
+				},
+				{
+					"name": "keyword.operator.logical.js",
+					"match": "\\!|&&|\\|\\||\\?\\?"
+				},
+				{
+					"name": "keyword.operator.bitwise.js",
+					"match": "\\&|~|\\^|\\|"
+				},
+				{
+					"name": "keyword.operator.assignment.js",
+					"match": "\\="
+				},
+				{
+					"name": "keyword.operator.decrement.js",
+					"match": "--"
+				},
+				{
+					"name": "keyword.operator.increment.js",
+					"match": "\\+\\+"
+				},
+				{
+					"name": "keyword.operator.arithmetic.js",
+					"match": "%|\\*|/|-|\\+"
+				},
+				{
+					"begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(?:(/=)|(?:(/)(?![/*]))))",
+					"end": "(?:(/=)|(?:(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)))",
+					"endCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.compound.js"
+						},
+						"2": {
+							"name": "keyword.operator.arithmetic.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(?:(/)(?![/*])))",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.assignment.compound.js"
+						},
+						"2": {
+							"name": "keyword.operator.arithmetic.js"
+						}
+					}
+				}
+			]
+		},
+		"typeof-operator": {
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.expression.typeof.js"
+				}
+			},
+			"end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+			"patterns": [
+				{
+					"include": "#type-arguments"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"literal": {
+			"patterns": [
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#boolean-literal"
+				},
+				{
+					"include": "#null-literal"
+				},
+				{
+					"include": "#undefined-literal"
+				},
+				{
+					"include": "#numericConstant-literal"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#this-literal"
+				},
+				{
+					"include": "#super-literal"
+				}
+			]
+		},
+		"array-literal": {
+			"name": "meta.array.literal.js",
+			"begin": "\\s*(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.brace.square.js"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "meta.brace.square.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"numeric-literal": {
+			"patterns": [
+				{
+					"name": "constant.numeric.hex.js",
+					"match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+					"captures": {
+						"1": {
+							"name": "storage.type.numeric.bigint.js"
+						}
+					}
+				},
+				{
+					"name": "constant.numeric.binary.js",
+					"match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+					"captures": {
+						"1": {
+							"name": "storage.type.numeric.bigint.js"
+						}
+					}
+				},
+				{
+					"name": "constant.numeric.octal.js",
+					"match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+					"captures": {
+						"1": {
+							"name": "storage.type.numeric.bigint.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)\n(?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$)",
+					"captures": {
+						"0": {
+							"name": "constant.numeric.decimal.js"
+						},
+						"1": {
+							"name": "meta.delimiter.decimal.period.js"
+						},
+						"2": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"3": {
+							"name": "meta.delimiter.decimal.period.js"
+						},
+						"4": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"5": {
+							"name": "meta.delimiter.decimal.period.js"
+						},
+						"6": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"7": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"8": {
+							"name": "meta.delimiter.decimal.period.js"
+						},
+						"9": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"10": {
+							"name": "meta.delimiter.decimal.period.js"
+						},
+						"11": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"12": {
+							"name": "meta.delimiter.decimal.period.js"
+						},
+						"13": {
+							"name": "storage.type.numeric.bigint.js"
+						},
+						"14": {
+							"name": "storage.type.numeric.bigint.js"
+						}
+					}
+				}
+			]
+		},
+		"boolean-literal": {
+			"patterns": [
+				{
+					"name": "constant.language.boolean.true.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))true(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "constant.language.boolean.false.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))false(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				}
+			]
+		},
+		"null-literal": {
+			"name": "constant.language.null.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))null(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"this-literal": {
+			"name": "variable.language.this.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))this\\b(?!\\$)"
+		},
+		"super-literal": {
+			"name": "variable.language.super.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))super\\b(?!\\$)"
+		},
+		"undefined-literal": {
+			"name": "constant.language.undefined.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))undefined(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"numericConstant-literal": {
+			"patterns": [
+				{
+					"name": "constant.language.nan.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))NaN(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "constant.language.infinity.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Infinity(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				}
+			]
+		},
+		"support-objects": {
+			"patterns": [
+				{
+					"name": "variable.language.arguments.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(arguments)\\b(?!\\$)"
+				},
+				{
+					"name": "support.class.promise.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(Promise)\\b(?!\\$)"
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(meta)\\b(?!\\$)",
+					"captures": {
+						"1": {
+							"name": "keyword.control.import.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.js"
+						},
+						"3": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"4": {
+							"name": "support.variable.property.importmeta.js"
+						}
+					}
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(target)\\b(?!\\$)",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.new.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.js"
+						},
+						"3": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"4": {
+							"name": "support.variable.property.target.js"
+						}
+					}
+				},
+				{
+					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"3": {
+							"name": "support.variable.property.js"
+						},
+						"4": {
+							"name": "support.constant.js"
+						}
+					}
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)",
+					"captures": {
+						"1": {
+							"name": "support.type.object.module.js"
+						},
+						"2": {
+							"name": "support.type.object.module.js"
+						},
+						"3": {
+							"name": "punctuation.accessor.js"
+						},
+						"4": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"5": {
+							"name": "support.type.object.module.js"
+						}
+					}
+				}
+			]
+		},
+		"identifiers": {
+			"patterns": [
+				{
+					"include": "#object-identifiers"
+				},
+				{
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"3": {
+							"name": "entity.name.function.js"
+						}
+					}
+				},
+				{
+					"match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"3": {
+							"name": "variable.other.constant.property.js"
+						}
+					}
+				},
+				{
+					"match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"3": {
+							"name": "variable.other.property.js"
+						}
+					}
+				},
+				{
+					"name": "variable.other.constant.js",
+					"match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+				},
+				{
+					"name": "variable.other.readwrite.js",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				}
+			]
+		},
+		"object-identifiers": {
+			"patterns": [
+				{
+					"name": "support.class.js",
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\\??\\.\\s*prototype\\b(?!\\$))"
+				},
+				{
+					"match": "(?x)(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:\n  (\\#?[[:upper:]][_$[:digit:][:upper:]]*) |\n  (\\#?[_$[:alpha:]][_$[:alnum:]]*)\n)(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"3": {
+							"name": "variable.other.constant.object.property.js"
+						},
+						"4": {
+							"name": "variable.other.object.property.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:\n  ([[:upper:]][_$[:digit:][:upper:]]*) |\n  ([_$[:alpha:]][_$[:alnum:]]*)\n)(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "variable.other.constant.object.js"
+						},
+						"2": {
+							"name": "variable.other.object.js"
+						}
+					}
+				}
+			]
+		},
+		"type-annotation": {
+			"patterns": [
+				{
+					"name": "meta.type.annotation.js",
+					"begin": "(:)(?=\\s*\\S)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.type.annotation.js"
+						}
+					},
+					"end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				{
+					"name": "meta.type.annotation.js",
+					"begin": "(:)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.type.annotation.js"
+						}
+					},
+					"end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			]
+		},
+		"parameter-type-annotation": {
+			"patterns": [
+				{
+					"name": "meta.type.annotation.js",
+					"begin": "(:)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.type.annotation.js"
+						}
+					},
+					"end": "(?=[,)])|(?==[^>])",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			]
+		},
+		"return-type": {
+			"patterns": [
+				{
+					"name": "meta.return.type.js",
+					"begin": "(?<=\\))\\s*(:)(?=\\s*\\S)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.type.annotation.js"
+						}
+					},
+					"end": "(?<![:|&])(?=$|^|[{};,]|//)",
+					"patterns": [
+						{
+							"include": "#return-type-core"
+						}
+					]
+				},
+				{
+					"name": "meta.return.type.js",
+					"begin": "(?<=\\))\\s*(:)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.type.annotation.js"
+						}
+					},
+					"end": "(?<![:|&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+					"patterns": [
+						{
+							"include": "#return-type-core"
+						}
+					]
+				}
+			]
+		},
+		"return-type-core": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?<=[:|&])(?=\\s*\\{)",
+					"end": "(?<=\\})",
+					"patterns": [
+						{
+							"include": "#type-object"
+						}
+					]
+				},
+				{
+					"include": "#type-predicate-operator"
+				},
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"arrow-return-type": {
+			"name": "meta.return.type.arrow.js",
+			"begin": "(?<=\\))\\s*(:)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.type.annotation.js"
+				}
+			},
+			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"possibly-arrow-return-type": {
+			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.arrow.js meta.return.type.arrow.js keyword.operator.type.annotation.js"
+				}
+			},
+			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"contentName": "meta.arrow.js meta.return.type.arrow.js",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"arrow-return-type-body": {
+			"patterns": [
+				{
+					"begin": "(?<=[:])(?=\\s*\\{)",
+					"end": "(?<=\\})",
+					"patterns": [
+						{
+							"include": "#type-object"
+						}
+					]
+				},
+				{
+					"include": "#type-predicate-operator"
+				},
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"type-parameters": {
+			"name": "meta.type.parameters.js",
+			"begin": "(<)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.typeparameters.begin.js"
+				}
+			},
+			"end": "(>)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.typeparameters.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"name": "storage.modifier.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(extends|in|out|const)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"include": "#type"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"name": "keyword.operator.assignment.js",
+					"match": "(=)(?!>)"
+				}
+			]
+		},
+		"type-arguments": {
+			"name": "meta.type.parameters.js",
+			"begin": "\\<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.typeparameters.begin.js"
+				}
+			},
+			"end": "\\>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.typeparameters.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type-arguments-body"
+				}
+			]
+		},
+		"type-arguments-body": {
+			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(_)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"captures": {
+						"0": {
+							"name": "keyword.operator.type.js"
+						}
+					}
+				},
+				{
+					"include": "#type"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"type": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#type-string"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#type-primitive"
+				},
+				{
+					"include": "#type-builtin-literals"
+				},
+				{
+					"include": "#type-parameters"
+				},
+				{
+					"include": "#type-tuple"
+				},
+				{
+					"include": "#type-object"
+				},
+				{
+					"include": "#type-operators"
+				},
+				{
+					"include": "#type-conditional"
+				},
+				{
+					"include": "#type-fn-type-parameters"
+				},
+				{
+					"include": "#type-paren-or-function-parameters"
+				},
+				{
+					"include": "#type-function-return-type"
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						}
+					}
+				},
+				{
+					"include": "#type-name"
+				}
+			]
+		},
+		"type-primitive": {
+			"name": "support.type.primitive.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|bigint|boolean|symbol|any|void|never|unknown)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"type-builtin-literals": {
+			"name": "support.type.builtin.js",
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(this|true|false|undefined|null|object)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+		},
+		"type-tuple": {
+			"name": "meta.type.tuple.js",
+			"begin": "\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.brace.square.js"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "meta.brace.square.js"
+				}
+			},
+			"patterns": [
+				{
+					"name": "keyword.operator.rest.js",
+					"match": "\\.\\.\\."
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?)?\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.label.js"
+						},
+						"2": {
+							"name": "keyword.operator.optional.js"
+						},
+						"3": {
+							"name": "punctuation.separator.label.js"
+						}
+					}
+				},
+				{
+					"include": "#type"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"type-object": {
+			"name": "meta.object.type.js",
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.block.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#method-declaration"
+				},
+				{
+					"include": "#indexer-declaration"
+				},
+				{
+					"include": "#indexer-mapped-type-declaration"
+				},
+				{
+					"include": "#field-declaration"
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"begin": "\\.\\.\\.",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.spread.js"
+						}
+					},
+					"end": "(?=\\}|;|,|$)|(?<=\\})",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				},
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"type-conditional": {
+			"patterns": [
+				{
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(extends)\\s+",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.js"
+						}
+					},
+					"end": "(?<=:)",
+					"patterns": [
+						{
+							"begin": "\\?",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.operator.ternary.js"
+								}
+							},
+							"end": ":",
+							"endCaptures": {
+								"0": {
+									"name": "keyword.operator.ternary.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#type"
+								}
+							]
+						},
+						{
+							"include": "#type"
+						}
+					]
+				}
+			]
+		},
+		"type-paren-or-function-parameters": {
+			"name": "meta.type.paren.cover.js",
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.brace.round.js"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.brace.round.js"
+				}
+			},
+			"patterns": [
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "entity.name.function.js variable.language.this.js"
+						},
+						"4": {
+							"name": "entity.name.function.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "variable.parameter.js variable.language.this.js"
+						},
+						"4": {
+							"name": "variable.parameter.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"name": "punctuation.separator.parameter.js",
+					"match": ","
+				},
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"type-fn-type-parameters": {
+			"patterns": [
+				{
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*\\<)",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.type.constructor.js storage.modifier.js"
+						},
+						"2": {
+							"name": "meta.type.constructor.js keyword.control.new.js"
+						}
+					},
+					"end": "(?<=>)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-parameters"
+						}
+					]
+				},
+				{
+					"name": "meta.type.constructor.js",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b\\s*(?=\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.control.new.js"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#function-parameters"
+						}
+					]
+				},
+				{
+					"name": "meta.type.function.js",
+					"begin": "(?x)(\n  (?=\n    [(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )\n  )\n)",
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#function-parameters"
+						}
+					]
+				}
+			]
+		},
+		"type-function-return-type": {
+			"patterns": [
+				{
+					"name": "meta.type.function.return.js",
+					"begin": "(=>)(?=\\s*\\S)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.function.arrow.js"
+						}
+					},
+					"end": "(?<!=>)(?<![|&])(?=[,\\]\\)\\{\\}=;>:\\?]|//|$)",
+					"patterns": [
+						{
+							"include": "#type-function-return-type-core"
+						}
+					]
+				},
+				{
+					"name": "meta.type.function.return.js",
+					"begin": "=>",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.function.arrow.js"
+						}
+					},
+					"end": "(?<!=>)(?<![|&])((?=[,\\]\\)\\{\\}=;:\\?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+					"patterns": [
+						{
+							"include": "#type-function-return-type-core"
+						}
+					]
+				}
+			]
+		},
+		"type-function-return-type-core": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?<==>)(?=\\s*\\{)",
+					"end": "(?<=\\})",
+					"patterns": [
+						{
+							"include": "#type-object"
+						}
+					]
+				},
+				{
+					"include": "#type-predicate-operator"
+				},
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"type-operators": {
+			"patterns": [
+				{
+					"include": "#typeof-operator"
+				},
+				{
+					"include": "#type-infer"
+				},
+				{
+					"begin": "([&|])(?=\\s*\\{)",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.type.js"
+						}
+					},
+					"end": "(?<=\\})",
+					"patterns": [
+						{
+							"include": "#type-object"
+						}
+					]
+				},
+				{
+					"begin": "[&|]",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.type.js"
+						}
+					},
+					"end": "(?=\\S)"
+				},
+				{
+					"name": "keyword.operator.expression.keyof.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))keyof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.operator.ternary.js",
+					"match": "(\\?|\\:)"
+				},
+				{
+					"name": "keyword.operator.expression.import.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*\\()"
+				}
+			]
+		},
+		"type-infer": {
+			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(infer)\\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?:\\s+(extends)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))?",
+					"name": "meta.type.infer.js",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.expression.infer.js"
+						},
+						"2": {
+							"name": "entity.name.type.js"
+						},
+						"3": {
+							"name": "keyword.operator.expression.extends.js"
+						}
+					}
+				}
+			]
+		},
+		"type-predicate-operator": {
+			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(asserts)\\s+)?(?!asserts)(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s(is)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.type.asserts.js"
+						},
+						"2": {
+							"name": "variable.parameter.js variable.language.this.js"
+						},
+						"3": {
+							"name": "variable.parameter.js"
+						},
+						"4": {
+							"name": "keyword.operator.expression.is.js"
+						}
+					}
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(asserts)\\s+(?!is)(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.type.asserts.js"
+						},
+						"2": {
+							"name": "variable.parameter.js variable.language.this.js"
+						},
+						"3": {
+							"name": "variable.parameter.js"
+						}
+					}
+				},
+				{
+					"name": "keyword.operator.type.asserts.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))asserts(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				},
+				{
+					"name": "keyword.operator.expression.is.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))is(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+				}
+			]
+		},
+		"type-name": {
+			"patterns": [
+				{
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(<)",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.module.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.js"
+						},
+						"3": {
+							"name": "punctuation.accessor.optional.js"
+						},
+						"4": {
+							"name": "meta.type.parameters.js punctuation.definition.typeparameters.begin.js"
+						}
+					},
+					"end": "(>)",
+					"endCaptures": {
+						"1": {
+							"name": "meta.type.parameters.js punctuation.definition.typeparameters.end.js"
+						}
+					},
+					"contentName": "meta.type.parameters.js",
+					"patterns": [
+						{
+							"include": "#type-arguments-body"
+						}
+					]
+				},
+				{
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(<)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.type.js"
+						},
+						"2": {
+							"name": "meta.type.parameters.js punctuation.definition.typeparameters.begin.js"
+						}
+					},
+					"end": "(>)",
+					"endCaptures": {
+						"1": {
+							"name": "meta.type.parameters.js punctuation.definition.typeparameters.end.js"
+						}
+					},
+					"contentName": "meta.type.parameters.js",
+					"patterns": [
+						{
+							"include": "#type-arguments-body"
+						}
+					]
+				},
+				{
+					"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.module.js"
+						},
+						"2": {
+							"name": "punctuation.accessor.js"
+						},
+						"3": {
+							"name": "punctuation.accessor.optional.js"
+						}
+					}
+				},
+				{
+					"name": "entity.name.type.js",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				}
+			]
+		},
+		"punctuation-comma": {
+			"name": "punctuation.separator.comma.js",
+			"match": ","
+		},
+		"punctuation-semicolon": {
+			"name": "punctuation.terminator.statement.js",
+			"match": ";"
+		},
+		"punctuation-accessor": {
+			"match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))",
+			"captures": {
+				"1": {
+					"name": "punctuation.accessor.js"
+				},
+				"2": {
+					"name": "punctuation.accessor.optional.js"
+				}
+			}
+		},
+		"string": {
+			"patterns": [
+				{
+					"include": "#qstring-single"
+				},
+				{
+					"include": "#qstring-double"
+				},
+				{
+					"include": "#template"
+				}
+			]
+		},
+		"qstring-double": {
+			"name": "string.quoted.double.js",
+			"begin": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.js"
+				}
+			},
+			"end": "(\")|((?:[^\\\\\\n])$)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.js"
+				},
+				"2": {
+					"name": "invalid.illegal.newline.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#string-character-escape"
+				}
+			]
+		},
+		"qstring-single": {
+			"name": "string.quoted.single.js",
+			"begin": "'",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.js"
+				}
+			},
+			"end": "(\\')|((?:[^\\\\\\n])$)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.js"
+				},
+				"2": {
+					"name": "invalid.illegal.newline.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#string-character-escape"
+				}
+			]
+		},
+		"string-character-escape": {
+			"name": "constant.character.escape.js",
+			"match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
+		},
+		"template": {
+			"patterns": [
+				{
+					"include": "#template-call"
+				},
+				{
+					"contentName": "string.template.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js"
+						},
+						"2": {
+							"name": "string.template.js punctuation.definition.string.template.begin.js"
+						}
+					},
+					"end": "`",
+					"endCaptures": {
+						"0": {
+							"name": "string.template.js punctuation.definition.string.template.end.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#template-substitution-element"
+						},
+						{
+							"include": "#string-character-escape"
+						}
+					]
+				}
+			]
+		},
+		"template-call": {
+			"patterns": [
+				{
+					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+							"patterns": [
+								{
+									"include": "#support-function-call-identifiers"
+								},
+								{
+									"name": "entity.name.function.tagged-template.js",
+									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+								}
+							]
+						},
+						{
+							"include": "#type-arguments"
+						}
+					]
+				},
+				{
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js"
+						}
+					},
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			]
+		},
+		"template-substitution-element": {
+			"name": "meta.template.expression.js",
+			"begin": "\\$\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.begin.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			],
+			"contentName": "meta.embedded.line.js"
+		},
+		"type-string": {
+			"patterns": [
+				{
+					"include": "#qstring-single"
+				},
+				{
+					"include": "#qstring-double"
+				},
+				{
+					"include": "#template-type"
+				}
+			]
+		},
+		"template-type": {
+			"patterns": [
+				{
+					"include": "#template-call"
+				},
+				{
+					"contentName": "string.template.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js"
+						},
+						"2": {
+							"name": "string.template.js punctuation.definition.string.template.begin.js"
+						}
+					},
+					"end": "`",
+					"endCaptures": {
+						"0": {
+							"name": "string.template.js punctuation.definition.string.template.end.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#template-type-substitution-element"
+						},
+						{
+							"include": "#string-character-escape"
+						}
+					]
+				}
+			]
+		},
+		"template-type-substitution-element": {
+			"name": "meta.template.expression.js",
+			"begin": "\\$\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.begin.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			],
+			"contentName": "meta.embedded.line.js"
+		},
+		"regex": {
+			"patterns": [
+				{
+					"name": "string.regexp.js",
+					"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.js"
+						}
+					},
+					"end": "(/)([dgimsuy]*)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.js"
+						},
+						"2": {
+							"name": "keyword.other.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#regexp"
+						}
+					]
+				},
+				{
+					"name": "string.regexp.js",
+					"begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.js"
+						}
+					},
+					"end": "(/)([dgimsuy]*)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.js"
+						},
+						"2": {
+							"name": "keyword.other.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#regexp"
+						}
+					]
+				}
+			]
+		},
+		"regexp": {
+			"patterns": [
+				{
+					"name": "keyword.control.anchor.regexp",
+					"match": "\\\\[bB]|\\^|\\$"
+				},
+				{
+					"match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>",
+					"captures": {
+						"0": {
+							"name": "keyword.other.back-reference.regexp"
+						},
+						"1": {
+							"name": "variable.other.regexp"
+						}
+					}
+				},
+				{
+					"name": "keyword.operator.quantifier.regexp",
+					"match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??"
+				},
+				{
+					"name": "keyword.operator.or.regexp",
+					"match": "\\|"
+				},
+				{
+					"name": "meta.group.assertion.regexp",
+					"begin": "(\\()((\\?=)|(\\?!)|(\\?<=)|(\\?<!))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.group.regexp"
+						},
+						"2": {
+							"name": "punctuation.definition.group.assertion.regexp"
+						},
+						"3": {
+							"name": "meta.assertion.look-ahead.regexp"
+						},
+						"4": {
+							"name": "meta.assertion.negative-look-ahead.regexp"
+						},
+						"5": {
+							"name": "meta.assertion.look-behind.regexp"
+						},
+						"6": {
+							"name": "meta.assertion.negative-look-behind.regexp"
+						}
+					},
+					"end": "(\\))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.group.regexp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#regexp"
+						}
+					]
+				},
+				{
+					"name": "meta.group.regexp",
+					"begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.regexp"
+						},
+						"1": {
+							"name": "punctuation.definition.group.no-capture.regexp"
+						},
+						"2": {
+							"name": "variable.other.regexp"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.regexp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#regexp"
+						}
+					]
+				},
+				{
+					"name": "constant.other.character-class.set.regexp",
+					"begin": "(\\[)(\\^)?",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.character-class.regexp"
+						},
+						"2": {
+							"name": "keyword.operator.negation.regexp"
+						}
+					},
+					"end": "(\\])",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.character-class.regexp"
+						}
+					},
+					"patterns": [
+						{
+							"name": "constant.other.character-class.range.regexp",
+							"match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+							"captures": {
+								"1": {
+									"name": "constant.character.numeric.regexp"
+								},
+								"2": {
+									"name": "constant.character.control.regexp"
+								},
+								"3": {
+									"name": "constant.character.escape.backslash.regexp"
+								},
+								"4": {
+									"name": "constant.character.numeric.regexp"
+								},
+								"5": {
+									"name": "constant.character.control.regexp"
+								},
+								"6": {
+									"name": "constant.character.escape.backslash.regexp"
+								}
+							}
+						},
+						{
+							"include": "#regex-character-class"
+						}
+					]
+				},
+				{
+					"include": "#regex-character-class"
+				}
+			]
+		},
+		"regex-character-class": {
+			"patterns": [
+				{
+					"name": "constant.other.character-class.regexp",
+					"match": "\\\\[wWsSdDtrnvf]|\\."
+				},
+				{
+					"name": "constant.character.numeric.regexp",
+					"match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})"
+				},
+				{
+					"name": "constant.character.control.regexp",
+					"match": "\\\\c[A-Z]"
+				},
+				{
+					"name": "constant.character.escape.backslash.regexp",
+					"match": "\\\\."
+				}
+			]
+		},
+		"comment": {
+			"patterns": [
+				{
+					"name": "comment.block.documentation.js",
+					"begin": "/\\*\\*(?!/)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.js"
+						}
+					},
+					"end": "\\*/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#docblock"
+						}
+					]
+				},
+				{
+					"name": "comment.block.js",
+					"begin": "(/\\*)(?:\\s*((@)internal)(?=\\s|(\\*/)))?",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.comment.js"
+						},
+						"2": {
+							"name": "storage.type.internaldeclaration.js"
+						},
+						"3": {
+							"name": "punctuation.decorator.internaldeclaration.js"
+						}
+					},
+					"end": "\\*/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.js"
+						}
+					}
+				},
+				{
+					"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.comment.leading.js"
+						},
+						"2": {
+							"name": "comment.line.double-slash.js"
+						},
+						"3": {
+							"name": "punctuation.definition.comment.js"
+						},
+						"4": {
+							"name": "storage.type.internaldeclaration.js"
+						},
+						"5": {
+							"name": "punctuation.decorator.internaldeclaration.js"
+						}
+					},
+					"end": "(?=$)",
+					"contentName": "comment.line.double-slash.js"
+				}
+			]
+		},
+		"single-line-comment-consuming-line-ending": {
+			"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.js"
+				},
+				"2": {
+					"name": "comment.line.double-slash.js"
+				},
+				"3": {
+					"name": "punctuation.definition.comment.js"
+				},
+				"4": {
+					"name": "storage.type.internaldeclaration.js"
+				},
+				"5": {
+					"name": "punctuation.decorator.internaldeclaration.js"
+				}
+			},
+			"end": "(?=^)",
+			"contentName": "comment.line.double-slash.js"
+		},
+		"directives": {
+			"name": "comment.line.triple-slash.directive.js",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.comment.js"
+				}
+			},
+			"end": "(?=$)",
+			"patterns": [
+				{
+					"name": "meta.tag.js",
+					"begin": "(<)(reference|amd-dependency|amd-module)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.directive.js"
+						},
+						"2": {
+							"name": "entity.name.tag.directive.js"
+						}
+					},
+					"end": "/>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.directive.js"
+						}
+					},
+					"patterns": [
+						{
+							"name": "entity.other.attribute-name.directive.js",
+							"match": "path|types|no-default-lib|lib|name|resolution-mode"
+						},
+						{
+							"name": "keyword.operator.assignment.js",
+							"match": "="
+						},
+						{
+							"include": "#string"
+						}
+					]
+				}
+			]
+		},
+		"docblock": {
+			"patterns": [
+				{
+					"match": "(?x)\n((@)(?:access|api))\n\\s+\n(private|protected|public)\n\\b",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "constant.language.access-type.jsdoc"
+						}
+					}
+				},
+				{
+					"match": "(?x)\n((@)author)\n\\s+\n(\n  [^@\\s<>*/]\n  (?:[^@<>*/]|\\*[^/])*\n)\n(?:\n  \\s*\n  (<)\n  ([^>\\s]+)\n  (>)\n)?",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "entity.name.type.instance.jsdoc"
+						},
+						"4": {
+							"name": "punctuation.definition.bracket.angle.begin.jsdoc"
+						},
+						"5": {
+							"name": "constant.other.email.link.underline.jsdoc"
+						},
+						"6": {
+							"name": "punctuation.definition.bracket.angle.end.jsdoc"
+						}
+					}
+				},
+				{
+					"match": "(?x)\n((@)borrows) \\s+\n((?:[^@\\s*/]|\\*[^/])+)    # <that namepath>\n\\s+ (as) \\s+              # as\n((?:[^@\\s*/]|\\*[^/])+)    # <this namepath>",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "entity.name.type.instance.jsdoc"
+						},
+						"4": {
+							"name": "keyword.operator.control.jsdoc"
+						},
+						"5": {
+							"name": "entity.name.type.instance.jsdoc"
+						}
+					}
+				},
+				{
+					"name": "meta.example.jsdoc",
+					"begin": "((@)example)\\s+",
+					"end": "(?=@|\\*/)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					},
+					"patterns": [
+						{
+							"match": "^\\s\\*\\s+"
+						},
+						{
+							"contentName": "constant.other.description.jsdoc",
+							"begin": "\\G(<)caption(>)",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.name.tag.inline.jsdoc"
+								},
+								"1": {
+									"name": "punctuation.definition.bracket.angle.begin.jsdoc"
+								},
+								"2": {
+									"name": "punctuation.definition.bracket.angle.end.jsdoc"
+								}
+							},
+							"end": "(</)caption(>)|(?=\\*/)",
+							"endCaptures": {
+								"0": {
+									"name": "entity.name.tag.inline.jsdoc"
+								},
+								"1": {
+									"name": "punctuation.definition.bracket.angle.begin.jsdoc"
+								},
+								"2": {
+									"name": "punctuation.definition.bracket.angle.end.jsdoc"
+								}
+							}
+						},
+						{
+							"match": "[^\\s@*](?:[^*]|\\*[^/])*",
+							"captures": {
+								"0": {
+									"name": "source.embedded.js"
+								}
+							}
+						}
+					]
+				},
+				{
+					"match": "(?x) ((@)kind) \\s+ (class|constant|event|external|file|function|member|mixin|module|namespace|typedef) \\b",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "constant.language.symbol-type.jsdoc"
+						}
+					}
+				},
+				{
+					"match": "(?x)\n((@)see)\n\\s+\n(?:\n  # URL\n  (\n    (?=https?://)\n    (?:[^\\s*]|\\*[^/])+\n  )\n  |\n  # JSDoc namepath\n  (\n    (?!\n      # Avoid matching bare URIs (also acceptable as links)\n      https?://\n      |\n      # Avoid matching {@inline tags}; we match those below\n      (?:\\[[^\\[\\]]*\\])? # Possible description [preceding]{@tag}\n      {@(?:link|linkcode|linkplain|tutorial)\\b\n    )\n    # Matched namepath\n    (?:[^@\\s*/]|\\*[^/])+\n  )\n)",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "variable.other.link.underline.jsdoc"
+						},
+						"4": {
+							"name": "entity.name.type.instance.jsdoc"
+						}
+					}
+				},
+				{
+					"match": "(?x)\n((@)template)\n\\s+\n# One or more valid identifiers\n(\n  [A-Za-z_$]         # First character: non-numeric word character\n  [\\w$.\\[\\]]*        # Rest of identifier\n  (?:                # Possible list of additional identifiers\n    \\s* , \\s*\n    [A-Za-z_$]\n    [\\w$.\\[\\]]*\n  )*\n)",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "variable.other.jsdoc"
+						}
+					}
+				},
+				{
+					"begin": "(?x)((@)template)\\s+(?={)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					},
+					"end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
+					"patterns": [
+						{
+							"include": "#jsdoctype"
+						},
+						{
+							"name": "variable.other.jsdoc",
+							"match": "([A-Za-z_$][\\w$.\\[\\]]*)"
+						}
+					]
+				},
+				{
+					"match": "(?x)\n(\n  (@)\n  (?:arg|argument|const|constant|member|namespace|param|var)\n)\n\\s+\n(\n  [A-Za-z_$]\n  [\\w$.\\[\\]]*\n)",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "variable.other.jsdoc"
+						}
+					}
+				},
+				{
+					"begin": "((@)typedef)\\s+(?={)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					},
+					"end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
+					"patterns": [
+						{
+							"include": "#jsdoctype"
+						},
+						{
+							"name": "entity.name.type.instance.jsdoc",
+							"match": "(?:[^@\\s*/]|\\*[^/])+"
+						}
+					]
+				},
+				{
+					"begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					},
+					"end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
+					"patterns": [
+						{
+							"include": "#jsdoctype"
+						},
+						{
+							"name": "variable.other.jsdoc",
+							"match": "([A-Za-z_$][\\w$.\\[\\]]*)"
+						},
+						{
+							"name": "variable.other.jsdoc",
+							"match": "(?x)\n(\\[)\\s*\n[\\w$]+\n(?:\n  (?:\\[\\])?                                        # Foo[ ].bar properties within an array\n  \\.                                                # Foo.Bar namespaced parameter\n  [\\w$]+\n)*\n(?:\n  \\s*\n  (=)                                                # [foo=bar] Default parameter value\n  \\s*\n  (\n    # The inner regexes are to stop the match early at */ and to not stop at escaped quotes\n    (?>\n      \"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\" |                      # [foo=\"bar\"] Double-quoted\n      '(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?' |                      # [foo='bar'] Single-quoted\n      \\[ (?:(?:\\*(?!/))|[^*])*? \\] |                                # [foo=[1,2]] Array literal\n      (?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*   # Everything else\n    )*\n  )\n)?\n\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+							"captures": {
+								"1": {
+									"name": "punctuation.definition.optional-value.begin.bracket.square.jsdoc"
+								},
+								"2": {
+									"name": "keyword.operator.assignment.jsdoc"
+								},
+								"3": {
+									"name": "source.embedded.js"
+								},
+								"4": {
+									"name": "punctuation.definition.optional-value.end.bracket.square.jsdoc"
+								},
+								"5": {
+									"name": "invalid.illegal.syntax.jsdoc"
+								}
+							}
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n(\n  (@)\n  (?:define|enum|exception|export|extends|lends|implements|modifies\n  |namespace|private|protected|returns?|satisfies|suppress|this|throws|type\n  |yields?)\n)\n\\s+(?={)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					},
+					"end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
+					"patterns": [
+						{
+							"include": "#jsdoctype"
+						}
+					]
+				},
+				{
+					"match": "(?x)\n(\n  (@)\n  (?:alias|augments|callback|constructs|emits|event|fires|exports?\n  |extends|external|function|func|host|lends|listens|interface|memberof!?\n  |method|module|mixes|mixin|name|requires|see|this|typedef|uses)\n)\n\\s+\n(\n  (?:\n    [^{}@\\s*] | \\*[^/]\n  )+\n)",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "entity.name.type.instance.jsdoc"
+						}
+					}
+				},
+				{
+					"contentName": "variable.other.jsdoc",
+					"begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "variable.other.jsdoc"
+						},
+						"4": {
+							"name": "punctuation.definition.string.begin.jsdoc"
+						}
+					},
+					"end": "(\\3)|(?=$|\\*/)",
+					"endCaptures": {
+						"0": {
+							"name": "variable.other.jsdoc"
+						},
+						"1": {
+							"name": "punctuation.definition.string.end.jsdoc"
+						}
+					}
+				},
+				{
+					"match": "((@)(?:default(?:value)?|license|tutorial|variation|version))\\s+([^\\s*]+)",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						},
+						"3": {
+							"name": "variable.other.jsdoc"
+						}
+					}
+				},
+				{
+					"name": "storage.type.class.jsdoc",
+					"match": "(?x) (@) (?:abstract|access|alias|api|arg|argument|async|attribute|augments|author|beta|borrows|bubbles |callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright |default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exception |exports?|extends|extension(?:_?for)?|external|externs|file|fileoverview|final|fires|for|func |function|generator|global|hideconstructor|host|ignore|implements|implicitCast|inherit[Dd]oc |inner|instance|interface|internal|kind|lends|license|listens|main|member|memberof!?|method |mixes|mixins?|modifies|module|name|namespace|noalias|nocollapse|nocompile|nosideeffects |override|overview|package|param|polymer(?:Behavior)?|preserve|private|prop|property|protected |public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary |suppress|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation |version|virtual|writeOnce|yields?) \\b",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					}
+				},
+				{
+					"include": "#inline-tags"
+				},
+				{
+					"match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\\s+)",
+					"captures": {
+						"1": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.block.tag.jsdoc"
+						}
+					}
+				}
+			]
+		},
+		"brackets": {
+			"patterns": [
+				{
+					"begin": "{",
+					"end": "}|(?=\\*/)",
+					"patterns": [
+						{
+							"include": "#brackets"
+						}
+					]
+				},
+				{
+					"begin": "\\[",
+					"end": "\\]|(?=\\*/)",
+					"patterns": [
+						{
+							"include": "#brackets"
+						}
+					]
+				}
+			]
+		},
+		"inline-tags": {
+			"patterns": [
+				{
+					"name": "constant.other.description.jsdoc",
+					"match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.bracket.square.begin.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.bracket.square.end.jsdoc"
+						}
+					}
+				},
+				{
+					"name": "entity.name.type.instance.jsdoc",
+					"begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.bracket.curly.begin.jsdoc"
+						},
+						"2": {
+							"name": "storage.type.class.jsdoc"
+						},
+						"3": {
+							"name": "punctuation.definition.inline.tag.jsdoc"
+						}
+					},
+					"end": "}|(?=\\*/)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.bracket.curly.end.jsdoc"
+						}
+					},
+					"patterns": [
+						{
+							"match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?",
+							"captures": {
+								"1": {
+									"name": "variable.other.link.underline.jsdoc"
+								},
+								"2": {
+									"name": "punctuation.separator.pipe.jsdoc"
+								}
+							}
+						},
+						{
+							"match": "\\G((?:[^{}@\\s|*]|\\*[^/])+)(\\|)?",
+							"captures": {
+								"1": {
+									"name": "variable.other.description.jsdoc"
+								},
+								"2": {
+									"name": "punctuation.separator.pipe.jsdoc"
+								}
+							}
+						}
+					]
+				}
+			]
+		},
+		"jsdoctype": {
+			"patterns": [
+				{
+					"contentName": "entity.name.type.instance.jsdoc",
+					"begin": "\\G({)",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.name.type.instance.jsdoc"
+						},
+						"1": {
+							"name": "punctuation.definition.bracket.curly.begin.jsdoc"
+						}
+					},
+					"end": "((}))\\s*|(?=\\*/)",
+					"endCaptures": {
+						"1": {
+							"name": "entity.name.type.instance.jsdoc"
+						},
+						"2": {
+							"name": "punctuation.definition.bracket.curly.end.jsdoc"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#brackets"
+						}
+					]
+				}
+			]
+		},
+		"jsx": {
+			"patterns": [
+				{
+					"include": "#jsx-tag-without-attributes-in-expression"
+				},
+				{
+					"include": "#jsx-tag-in-expression"
+				}
+			]
+		},
+		"jsx-tag-without-attributes-in-expression": {
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"patterns": [
+				{
+					"include": "#jsx-tag-without-attributes"
+				}
+			]
+		},
+		"jsx-tag-without-attributes": {
+			"name": "meta.tag.without-attributes.js",
+			"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+			"end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.tag.begin.js"
+				},
+				"2": {
+					"name": "entity.name.tag.namespace.js"
+				},
+				"3": {
+					"name": "punctuation.separator.namespace.js"
+				},
+				"4": {
+					"name": "entity.name.tag.js"
+				},
+				"5": {
+					"name": "support.class.component.js"
+				},
+				"6": {
+					"name": "punctuation.definition.tag.end.js"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.tag.begin.js"
+				},
+				"2": {
+					"name": "entity.name.tag.namespace.js"
+				},
+				"3": {
+					"name": "punctuation.separator.namespace.js"
+				},
+				"4": {
+					"name": "entity.name.tag.js"
+				},
+				"5": {
+					"name": "support.class.component.js"
+				},
+				"6": {
+					"name": "punctuation.definition.tag.end.js"
+				}
+			},
+			"contentName": "meta.jsx.children.js",
+			"patterns": [
+				{
+					"include": "#jsx-children"
+				}
+			]
+		},
+		"jsx-tag-in-expression": {
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"patterns": [
+				{
+					"include": "#jsx-tag"
+				}
+			]
+		},
+		"jsx-tag": {
+			"name": "meta.tag.js",
+			"begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.tag.end.js"
+				},
+				"2": {
+					"name": "punctuation.definition.tag.begin.js"
+				},
+				"3": {
+					"name": "entity.name.tag.namespace.js"
+				},
+				"4": {
+					"name": "punctuation.separator.namespace.js"
+				},
+				"5": {
+					"name": "entity.name.tag.js"
+				},
+				"6": {
+					"name": "support.class.component.js"
+				},
+				"7": {
+					"name": "punctuation.definition.tag.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.js"
+						},
+						"2": {
+							"name": "entity.name.tag.namespace.js"
+						},
+						"3": {
+							"name": "punctuation.separator.namespace.js"
+						},
+						"4": {
+							"name": "entity.name.tag.js"
+						},
+						"5": {
+							"name": "support.class.component.js"
+						}
+					},
+					"end": "(?=[/]?>)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-arguments"
+						},
+						{
+							"include": "#jsx-tag-attributes"
+						}
+					]
+				},
+				{
+					"begin": "(>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.end.js"
+						}
+					},
+					"end": "(?=</)",
+					"contentName": "meta.jsx.children.js",
+					"patterns": [
+						{
+							"include": "#jsx-children"
+						}
+					]
+				}
+			]
+		},
+		"jsx-children": {
+			"patterns": [
+				{
+					"include": "#jsx-tag-without-attributes"
+				},
+				{
+					"include": "#jsx-tag"
+				},
+				{
+					"include": "#jsx-evaluated-code"
+				},
+				{
+					"include": "#jsx-entities"
+				}
+			]
+		},
+		"jsx-evaluated-code": {
+			"contentName": "meta.embedded.expression.js",
+			"begin": "\\{",
+			"end": "\\}",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.embedded.begin.js"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.embedded.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"jsx-entities": {
+			"patterns": [
+				{
+					"name": "constant.character.entity.js",
+					"match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.js"
+						},
+						"3": {
+							"name": "punctuation.definition.entity.js"
+						}
+					}
+				}
+			]
+		},
+		"jsx-tag-attributes": {
+			"name": "meta.tag.attributes.js",
+			"begin": "\\s+",
+			"end": "(?=[/]?>)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#jsx-tag-attribute-name"
+				},
+				{
+					"include": "#jsx-tag-attribute-assignment"
+				},
+				{
+					"include": "#jsx-string-double-quoted"
+				},
+				{
+					"include": "#jsx-string-single-quoted"
+				},
+				{
+					"include": "#jsx-evaluated-code"
+				},
+				{
+					"include": "#jsx-tag-attributes-illegal"
+				}
+			]
+		},
+		"jsx-tag-attribute-name": {
+			"match": "(?x)\n  \\s*\n  (?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?\n  ([_$[:alpha:]][-_$[:alnum:]]*)\n  (?=\\s|=|/?>|/\\*|//)",
+			"captures": {
+				"1": {
+					"name": "entity.other.attribute-name.namespace.js"
+				},
+				"2": {
+					"name": "punctuation.separator.namespace.js"
+				},
+				"3": {
+					"name": "entity.other.attribute-name.js"
+				}
+			}
+		},
+		"jsx-tag-attribute-assignment": {
+			"name": "keyword.operator.assignment.js",
+			"match": "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))"
+		},
+		"jsx-string-double-quoted": {
+			"name": "string.quoted.double.js",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.js"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#jsx-entities"
+				}
+			]
+		},
+		"jsx-string-single-quoted": {
+			"name": "string.quoted.single.js",
+			"begin": "'",
+			"end": "'",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.js"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#jsx-entities"
+				}
+			]
+		},
+		"jsx-tag-attributes-illegal": {
+			"name": "invalid.illegal.attribute.js",
+			"match": "\\S+"
+		}
+	}
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/UpdateTextMate.ps1 b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/UpdateTextMate.ps1
new file mode 100644
index 000000000..e701f52d6
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/UpdateTextMate.ps1
@@ -0,0 +1,40 @@
+# This script updates our *.tmLanguage.json files from the latest copies in the VS Code repo.
+#
+# We pull these files from the VS Code repo's main branch, and VS Code in turn pulls them from
+# various repos, but rather than pull directly from them, by using the VS Code repo we get the
+# benefit of their testing, and their finding the best sources for the various languages.
+
+# Need to run this first: Install-Module -Name PowerShellForGitHub
+Import-Module -Name PowerShellForGitHub
+
+function DownloadTmLanguageJson {
+    param (
+        [string]$sha,
+        [string]$lang,
+        [string]$filename
+    )
+
+    if ($filename -eq "") {
+        $filename = "$lang.tmLanguage.json"
+    }
+
+    # tmLanguage.json
+    $url = "https://raw.githubusercontent.com/microsoft/vscode/$sha/extensions/$lang/syntaxes/$filename"
+    Write-Host "Downloading $url"
+
+    $content = Invoke-WebRequest -Uri $url
+
+    # Copy to grammar tests
+    $content.content | Out-File -FilePath "$fileName" -Encoding ascii
+}
+
+# Find the current main branch SHA to download from
+$branch = Get-GitHubBranch -OwnerName "microsoft" -RepositoryName "vscode" -BranchName "main"
+$sha = $branch.commit.sha
+Write-Host "VS Code main branch SHA: $sha"
+
+DownloadTmLanguageJson -sha $sha -lang "csharp"
+DownloadTmLanguageJson -sha $sha -lang "css"
+DownloadTmLanguageJson -sha $sha -lang "html"
+# GitHub URLs are case sensetive, and JavaScript is special
+DownloadTmLanguageJson -sha $sha -lang "javascript" -filename "JavaScript.tmLanguage.json"
\ No newline at end of file
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/csharp.tmLanguage.json b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/csharp.tmLanguage.json
new file mode 100644
index 000000000..c4266da46
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/csharp.tmLanguage.json
@@ -0,0 +1,5028 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/dotnet/csharp-tmLanguage/blob/master/grammars/csharp.tmLanguage",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/772323937fedd65c6dc1c8ce6ea41d97415ed7d1",
+	"name": "C#",
+	"scopeName": "source.cs",
+	"patterns": [
+		{
+			"include": "#preprocessor"
+		},
+		{
+			"include": "#comment"
+		},
+		{
+			"include": "#directives"
+		},
+		{
+			"include": "#declarations"
+		},
+		{
+			"include": "#script-top-level"
+		}
+	],
+	"repository": {
+		"directives": {
+			"patterns": [
+				{
+					"include": "#extern-alias-directive"
+				},
+				{
+					"include": "#using-directive"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"declarations": {
+			"patterns": [
+				{
+					"include": "#namespace-declaration"
+				},
+				{
+					"include": "#type-declarations"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"script-top-level": {
+			"patterns": [
+				{
+					"include": "#statement"
+				},
+				{
+					"include": "#method-declaration"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"type-declarations": {
+			"patterns": [
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#storage-modifier"
+				},
+				{
+					"include": "#class-declaration"
+				},
+				{
+					"include": "#delegate-declaration"
+				},
+				{
+					"include": "#enum-declaration"
+				},
+				{
+					"include": "#interface-declaration"
+				},
+				{
+					"include": "#struct-declaration"
+				},
+				{
+					"include": "#record-declaration"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"class-or-struct-members": {
+			"patterns": [
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#storage-modifier"
+				},
+				{
+					"include": "#type-declarations"
+				},
+				{
+					"include": "#property-declaration"
+				},
+				{
+					"include": "#field-declaration"
+				},
+				{
+					"include": "#event-declaration"
+				},
+				{
+					"include": "#indexer-declaration"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#constructor-declaration"
+				},
+				{
+					"include": "#destructor-declaration"
+				},
+				{
+					"include": "#operator-declaration"
+				},
+				{
+					"include": "#conversion-operator-declaration"
+				},
+				{
+					"include": "#method-declaration"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"interface-members": {
+			"patterns": [
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#property-declaration"
+				},
+				{
+					"include": "#event-declaration"
+				},
+				{
+					"include": "#indexer-declaration"
+				},
+				{
+					"include": "#method-declaration"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"statement": {
+			"patterns": [
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#while-statement"
+				},
+				{
+					"include": "#do-statement"
+				},
+				{
+					"include": "#for-statement"
+				},
+				{
+					"include": "#foreach-statement"
+				},
+				{
+					"include": "#if-statement"
+				},
+				{
+					"include": "#else-part"
+				},
+				{
+					"include": "#switch-statement"
+				},
+				{
+					"include": "#goto-statement"
+				},
+				{
+					"include": "#return-statement"
+				},
+				{
+					"include": "#break-or-continue-statement"
+				},
+				{
+					"include": "#throw-statement"
+				},
+				{
+					"include": "#yield-statement"
+				},
+				{
+					"include": "#await-statement"
+				},
+				{
+					"include": "#try-statement"
+				},
+				{
+					"include": "#checked-unchecked-statement"
+				},
+				{
+					"include": "#lock-statement"
+				},
+				{
+					"include": "#using-statement"
+				},
+				{
+					"include": "#labeled-statement"
+				},
+				{
+					"include": "#object-creation-expression"
+				},
+				{
+					"include": "#array-creation-expression"
+				},
+				{
+					"include": "#anonymous-object-creation-expression"
+				},
+				{
+					"include": "#local-declaration"
+				},
+				{
+					"include": "#block"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"expression": {
+			"patterns": [
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#checked-unchecked-expression"
+				},
+				{
+					"include": "#typeof-or-default-expression"
+				},
+				{
+					"include": "#nameof-expression"
+				},
+				{
+					"include": "#default-literal-expression"
+				},
+				{
+					"include": "#throw-expression"
+				},
+				{
+					"include": "#raw-interpolated-string"
+				},
+				{
+					"include": "#interpolated-string"
+				},
+				{
+					"include": "#verbatim-interpolated-string"
+				},
+				{
+					"include": "#type-builtin"
+				},
+				{
+					"include": "#this-or-base-expression"
+				},
+				{
+					"include": "#switch-expression"
+				},
+				{
+					"include": "#conditional-operator"
+				},
+				{
+					"include": "#expression-operators"
+				},
+				{
+					"include": "#await-expression"
+				},
+				{
+					"include": "#query-expression"
+				},
+				{
+					"include": "#as-expression"
+				},
+				{
+					"include": "#is-expression"
+				},
+				{
+					"include": "#anonymous-method-expression"
+				},
+				{
+					"include": "#object-creation-expression"
+				},
+				{
+					"include": "#array-creation-expression"
+				},
+				{
+					"include": "#anonymous-object-creation-expression"
+				},
+				{
+					"include": "#invocation-expression"
+				},
+				{
+					"include": "#member-access-expression"
+				},
+				{
+					"include": "#element-access-expression"
+				},
+				{
+					"include": "#cast-expression"
+				},
+				{
+					"include": "#literal"
+				},
+				{
+					"include": "#parenthesized-expression"
+				},
+				{
+					"include": "#tuple-deconstruction-assignment"
+				},
+				{
+					"include": "#initializer-expression"
+				},
+				{
+					"include": "#identifier"
+				}
+			]
+		},
+		"extern-alias-directive": {
+			"begin": "\\s*(extern)\\b\\s*(alias)\\b\\s*(@?[_[:alpha:]][_[:alnum:]]*)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.extern.cs"
+				},
+				"2": {
+					"name": "keyword.other.alias.cs"
+				},
+				"3": {
+					"name": "variable.other.alias.cs"
+				}
+			},
+			"end": "(?=;)"
+		},
+		"using-directive": {
+			"patterns": [
+				{
+					"begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(static)\\b\\s+(\\b(unsafe)\\b\\s+)?",
+					"beginCaptures": {
+						"2": {
+							"name": "keyword.other.global.cs"
+						},
+						"3": {
+							"name": "keyword.other.using.cs"
+						},
+						"4": {
+							"name": "keyword.other.static.cs"
+						},
+						"6": {
+							"name": "storage.modifier.cs"
+						}
+					},
+					"end": "(?=;)",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				{
+					"begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(\\b(unsafe)\\b\\s+)?(?=(@?[_[:alpha:]][_[:alnum:]]*)\\s*=)",
+					"beginCaptures": {
+						"2": {
+							"name": "keyword.other.global.cs"
+						},
+						"3": {
+							"name": "keyword.other.using.cs"
+						},
+						"5": {
+							"name": "storage.modifier.cs"
+						},
+						"6": {
+							"name": "entity.name.type.alias.cs"
+						}
+					},
+					"end": "(?=;)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type"
+						},
+						{
+							"include": "#operator-assignment"
+						}
+					]
+				},
+				{
+					"begin": "(\\b(global)\\b\\s+)?\\b(using)\\s*(?!\\(|\\s|var)",
+					"beginCaptures": {
+						"2": {
+							"name": "keyword.other.global.cs"
+						},
+						"3": {
+							"name": "keyword.other.using.cs"
+						}
+					},
+					"end": "(?=;)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"name": "entity.name.type.namespace.cs",
+							"match": "@?[_[:alpha:]][_[:alnum:]]*"
+						},
+						{
+							"include": "#operator-assignment"
+						}
+					]
+				}
+			]
+		},
+		"attribute-section": {
+			"begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(\\:)?",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.squarebracket.open.cs"
+				},
+				"2": {
+					"name": "keyword.other.attribute-specifier.cs"
+				},
+				"3": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			},
+			"end": "(\\])",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.squarebracket.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#attribute"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"attribute": {
+			"patterns": [
+				{
+					"include": "#type-name"
+				},
+				{
+					"include": "#attribute-arguments"
+				}
+			]
+		},
+		"attribute-arguments": {
+			"begin": "(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#attribute-named-argument"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"attribute-named-argument": {
+			"begin": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?==)",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.variable.property.cs"
+				}
+			},
+			"end": "(?=(,|\\)))",
+			"patterns": [
+				{
+					"include": "#operator-assignment"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"namespace-declaration": {
+			"begin": "\\b(namespace)\\s+",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.namespace.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"name": "entity.name.type.namespace.cs",
+					"match": "@?[_[:alpha:]][_[:alnum:]]*"
+				},
+				{
+					"include": "#punctuation-accessor"
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#declarations"
+						},
+						{
+							"include": "#using-directive"
+						},
+						{
+							"include": "#punctuation-semicolon"
+						}
+					]
+				}
+			]
+		},
+		"storage-modifier": {
+			"name": "storage.modifier.cs",
+			"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required|file)\\b"
+		},
+		"class-declaration": {
+			"begin": "(?=(\\brecord\\b\\s+)?\\bclass\\b)",
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "(?x)\n(\\b(record)\\b\\s+)?\n\\b(class)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
+					"beginCaptures": {
+						"2": {
+							"name": "keyword.other.record.cs"
+						},
+						"3": {
+							"name": "keyword.other.class.cs"
+						},
+						"4": {
+							"name": "entity.name.type.class.cs"
+						}
+					},
+					"end": "(?=\\{)|(?=;)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-parameter-list"
+						},
+						{
+							"include": "#parenthesized-parameter-list"
+						},
+						{
+							"include": "#base-types"
+						},
+						{
+							"include": "#generic-constraints"
+						}
+					]
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#class-or-struct-members"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"delegate-declaration": {
+			"begin": "(?x)\n(?:\\b(delegate)\\b)\\s+\n(?<type_name>\n  (?:\n    (?:ref\\s+(?:readonly\\s+)?)?   # ref return\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+\n(\\g<identifier>)\\s*\n(<([^<>]+)>)?\\s*\n(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.delegate.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.type.delegate.cs"
+				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#type-parameter-list"
+						}
+					]
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#parenthesized-parameter-list"
+				},
+				{
+					"include": "#generic-constraints"
+				}
+			]
+		},
+		"enum-declaration": {
+			"begin": "(?=\\benum\\b)",
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"begin": "(?=enum)",
+					"end": "(?=\\{)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"match": "(enum)\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
+							"captures": {
+								"1": {
+									"name": "keyword.other.enum.cs"
+								},
+								"2": {
+									"name": "entity.name.type.enum.cs"
+								}
+							}
+						},
+						{
+							"begin": ":",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.separator.colon.cs"
+								}
+							},
+							"end": "(?=\\{)",
+							"patterns": [
+								{
+									"include": "#type"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#attribute-section"
+						},
+						{
+							"include": "#punctuation-comma"
+						},
+						{
+							"begin": "@?[_[:alpha:]][_[:alnum:]]*",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.name.variable.enum-member.cs"
+								}
+							},
+							"end": "(?=(,|\\}))",
+							"patterns": [
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						}
+					]
+				},
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"interface-declaration": {
+			"begin": "(?=\\binterface\\b)",
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"begin": "(?x)\n(interface)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.other.interface.cs"
+						},
+						"2": {
+							"name": "entity.name.type.interface.cs"
+						}
+					},
+					"end": "(?=\\{)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-parameter-list"
+						},
+						{
+							"include": "#base-types"
+						},
+						{
+							"include": "#generic-constraints"
+						}
+					]
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#interface-members"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"record-declaration": {
+			"begin": "(?=\\brecord\\b)",
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "(?x)\n(record)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.other.record.cs"
+						},
+						"2": {
+							"name": "entity.name.type.class.cs"
+						}
+					},
+					"end": "(?=\\{)|(?=;)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-parameter-list"
+						},
+						{
+							"include": "#parenthesized-parameter-list"
+						},
+						{
+							"include": "#base-types"
+						},
+						{
+							"include": "#generic-constraints"
+						}
+					]
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#class-or-struct-members"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"struct-declaration": {
+			"begin": "(?=(\\brecord\\b\\s+)?\\bstruct\\b)",
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "(?x)\n(\\b(record)\\b\\s+)?\n(struct)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
+					"beginCaptures": {
+						"2": {
+							"name": "keyword.other.record.cs"
+						},
+						"3": {
+							"name": "keyword.other.struct.cs"
+						},
+						"4": {
+							"name": "entity.name.type.struct.cs"
+						}
+					},
+					"end": "(?=\\{)|(?=;)",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#type-parameter-list"
+						},
+						{
+							"include": "#parenthesized-parameter-list"
+						},
+						{
+							"include": "#base-types"
+						},
+						{
+							"include": "#generic-constraints"
+						}
+					]
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#class-or-struct-members"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"type-parameter-list": {
+			"begin": "\\<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.typeparameters.begin.cs"
+				}
+			},
+			"end": "\\>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.typeparameters.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"match": "\\b(in|out)\\b",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.cs"
+						}
+					}
+				},
+				{
+					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\b",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.type-parameter.cs"
+						}
+					}
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#attribute-section"
+				}
+			]
+		},
+		"base-types": {
+			"begin": ":",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			},
+			"end": "(?=\\{|where|;)",
+			"patterns": [
+				{
+					"include": "#type"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#preprocessor"
+				}
+			]
+		},
+		"generic-constraints": {
+			"begin": "(where)\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*(:)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.where.cs"
+				},
+				"2": {
+					"name": "entity.name.type.type-parameter.cs"
+				},
+				"3": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			},
+			"end": "(?=\\{|where|;|=>)",
+			"patterns": [
+				{
+					"name": "keyword.other.class.cs",
+					"match": "\\bclass\\b"
+				},
+				{
+					"name": "keyword.other.struct.cs",
+					"match": "\\bstruct\\b"
+				},
+				{
+					"match": "(new)\\s*(\\()\\s*(\\))",
+					"captures": {
+						"1": {
+							"name": "keyword.other.new.cs"
+						},
+						"2": {
+							"name": "punctuation.parenthesis.open.cs"
+						},
+						"3": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					}
+				},
+				{
+					"include": "#type"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#generic-constraints"
+				}
+			]
+		},
+		"field-declaration": {
+			"begin": "(?x)\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+\n(\\g<identifier>)\\s* # first field name\n(?!=>|==)(?=,|;|=|$)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"6": {
+					"name": "entity.name.variable.field.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"name": "entity.name.variable.field.cs",
+					"match": "@?[_[:alpha:]][_[:alnum:]]*"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#class-or-struct-members"
+				}
+			]
+		},
+		"property-declaration": {
+			"begin": "(?x)\n\n# The negative lookahead below ensures that we don't match nested types\n# or other declarations as properties.\n(?![[:word:][:space:]]*\\b(?:class|interface|struct|enum|event)\\b)\n\n(?<return_type>\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref return\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\\s+\n)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(?<property_name>\\g<identifier>)\\s*\n(?=\\{|=>|$)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#type"
+						},
+						{
+							"include": "#punctuation-accessor"
+						}
+					]
+				},
+				"8": {
+					"name": "entity.name.variable.property.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#property-accessors"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#class-or-struct-members"
+				}
+			]
+		},
+		"indexer-declaration": {
+			"begin": "(?x)\n(?<return_type>\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref return\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\\s+\n)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(?<indexer_name>this)\\s*\n(?=\\[)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#type"
+						},
+						{
+							"include": "#punctuation-accessor"
+						}
+					]
+				},
+				"8": {
+					"name": "keyword.other.this.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#bracketed-parameter-list"
+				},
+				{
+					"include": "#property-accessors"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"event-declaration": {
+			"begin": "(?x)\n\\b(event)\\b\\s*\n(?<return_type>\n  (?<type_name>\n    (?:\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\\s+\n)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(?<event_names>\\g<identifier>(?:\\s*,\\s*\\g<identifier>)*)\\s*\n(?=\\{|;|$)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.event.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#type"
+						},
+						{
+							"include": "#punctuation-accessor"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"name": "entity.name.variable.event.cs",
+							"match": "@?[_[:alpha:]][_[:alnum:]]*"
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#event-accessors"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"property-accessors": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.open.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"name": "storage.modifier.cs",
+					"match": "\\b(private|protected|internal)\\b"
+				},
+				{
+					"name": "keyword.other.get.cs",
+					"match": "\\b(get)\\b"
+				},
+				{
+					"name": "keyword.other.set.cs",
+					"match": "\\b(set)\\b"
+				},
+				{
+					"name": "keyword.other.init.cs",
+					"match": "\\b(init)\\b"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"event-accessors": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.open.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"name": "keyword.other.add.cs",
+					"match": "\\b(add)\\b"
+				},
+				{
+					"name": "keyword.other.remove.cs",
+					"match": "\\b(remove)\\b"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				},
+				{
+					"include": "#punctuation-semicolon"
+				}
+			]
+		},
+		"method-declaration": {
+			"begin": "(?x)\n(?<return_type>\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref return\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\\s+\n)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(\\g<identifier>)\\s*\n(<([^<>]+)>)?\\s*\n(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#type"
+						},
+						{
+							"include": "#punctuation-accessor"
+						}
+					]
+				},
+				"8": {
+					"name": "entity.name.function.cs"
+				},
+				"9": {
+					"patterns": [
+						{
+							"include": "#type-parameter-list"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#parenthesized-parameter-list"
+				},
+				{
+					"include": "#generic-constraints"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"constructor-declaration": {
+			"begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\b",
+					"captures": {
+						"1": {
+							"name": "entity.name.function.cs"
+						}
+					}
+				},
+				{
+					"begin": "(:)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.separator.colon.cs"
+						}
+					},
+					"end": "(?=\\{|=>)",
+					"patterns": [
+						{
+							"include": "#constructor-initializer"
+						}
+					]
+				},
+				{
+					"include": "#parenthesized-parameter-list"
+				},
+				{
+					"include": "#preprocessor"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"constructor-initializer": {
+			"begin": "\\b(?:(base)|(this))\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.base.cs"
+				},
+				"2": {
+					"name": "keyword.other.this.cs"
+				}
+			},
+			"end": "(?<=\\))",
+			"patterns": [
+				{
+					"include": "#argument-list"
+				}
+			]
+		},
+		"destructor-declaration": {
+			"begin": "(~)(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.tilde.cs"
+				},
+				"2": {
+					"name": "entity.name.function.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#parenthesized-parameter-list"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"operator-declaration": {
+			"begin": "(?x)\n(?<type_name>\n  (?:\n    (?:ref\\s+(?:readonly\\s+)?)?   # ref return\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s*\n(?<operator_keyword>(?:\\b(?:operator)))\\s*\n(?<operator>(?:\\+|-|\\*|/|%|&|\\||\\^|\\<\\<|\\>\\>|==|!=|\\>|\\<|\\>=|\\<=|!|~|\\+\\+|--|true|false))\\s*\n(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"6": {
+					"name": "keyword.other.operator-decl.cs"
+				},
+				"7": {
+					"name": "entity.name.function.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#parenthesized-parameter-list"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"conversion-operator-declaration": {
+			"begin": "(?x)\n(?<explicit_or_implicit_keyword>(?:\\b(?:explicit|implicit)))\\s*\n(?<operator_keyword>(?:\\b(?:operator)))\\s*\n(?<type_name>\n  (?:\n    (?:ref\\s+(?:readonly\\s+)?)?   # ref return\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s*\n(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"match": "\\b(explicit)\\b",
+							"captures": {
+								"1": {
+									"name": "keyword.other.explicit.cs"
+								}
+							}
+						},
+						{
+							"match": "\\b(implicit)\\b",
+							"captures": {
+								"1": {
+									"name": "keyword.other.implicit.cs"
+								}
+							}
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.other.operator-decl.cs"
+				},
+				"3": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#parenthesized-parameter-list"
+				},
+				{
+					"include": "#expression-body"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"block": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.open.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"variable-initializer": {
+			"begin": "(?<!=|!)(=)(?!=|>)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.assignment.cs"
+				}
+			},
+			"end": "(?=[,\\)\\];}])",
+			"patterns": [
+				{
+					"include": "#ref-modifier"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"expression-body": {
+			"begin": "=>",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.arrow.cs"
+				}
+			},
+			"end": "(?=[,\\);}])",
+			"patterns": [
+				{
+					"include": "#ref-modifier"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"goto-statement": {
+			"begin": "(?<!\\.)\\b(goto)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.goto.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"begin": "\\b(case)\\b",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.case.cs"
+						}
+					},
+					"end": "(?=;)",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"match": "\\b(default)\\b",
+					"captures": {
+						"1": {
+							"name": "keyword.control.default.cs"
+						}
+					}
+				},
+				{
+					"name": "entity.name.label.cs",
+					"match": "@?[_[:alpha:]][_[:alnum:]]*"
+				}
+			]
+		},
+		"return-statement": {
+			"begin": "(?<!\\.)\\b(return)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.flow.return.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#ref-modifier"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"break-or-continue-statement": {
+			"match": "(?<!\\.)\\b(?:(break)|(continue))\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.control.flow.break.cs"
+				},
+				"2": {
+					"name": "keyword.control.flow.continue.cs"
+				}
+			}
+		},
+		"throw-statement": {
+			"begin": "(?<!\\.)\\b(throw)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.flow.throw.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"yield-statement": {
+			"patterns": [
+				{
+					"include": "#yield-return-statement"
+				},
+				{
+					"include": "#yield-break-statement"
+				}
+			]
+		},
+		"yield-return-statement": {
+			"begin": "(?<!\\.)\\b(yield)\\b\\s*\\b(return)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.flow.yield.cs"
+				},
+				"2": {
+					"name": "keyword.control.flow.return.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"yield-break-statement": {
+			"match": "(?<!\\.)\\b(yield)\\b\\s*\\b(break)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.control.flow.yield.cs"
+				},
+				"2": {
+					"name": "keyword.control.flow.break.cs"
+				}
+			}
+		},
+		"await-statement": {
+			"begin": "(?<!\\.)\\b(await)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.await.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"if-statement": {
+			"begin": "(?<!\\.)\\b(if)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.conditional.if.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"else-part": {
+			"begin": "(?<!\\.)\\b(else)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.conditional.else.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"switch-statement": {
+			"begin": "(?<!\\.)\\b(switch)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.switch.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#switch-label"
+						},
+						{
+							"include": "#statement"
+						}
+					]
+				}
+			]
+		},
+		"switch-expression": {
+			"begin": "(?x) (?<!\\.)\\b(switch)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.switch.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.open.cs"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.curlybrace.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#literal"
+						},
+						{
+							"include": "#switch-var-pattern"
+						},
+						{
+							"include": "#switch-property-expression"
+						},
+						{
+							"include": "#member-access-expression"
+						},
+						{
+							"include": "#switch-pattern"
+						},
+						{
+							"include": "#expression-body"
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
+		},
+		"switch-pattern": {
+			"begin": "(?x) # e.g. int x OR var x\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+\n(\\g<identifier>)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"2": {
+					"name": "entity.name.variable.local.cs"
+				}
+			},
+			"end": "(?==>)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#switch-when-clause"
+				}
+			]
+		},
+		"switch-property-expression": {
+			"begin": "(?x) # e.g. int x OR var x\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?\\s*\n(\\{)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"6": {
+					"name": "punctuation.curlybrace.open.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"switch-var-pattern": {
+			"begin": "(?x) # match foreach (var (x, y) in ...)\n(?:\\b(var)\\b\\s*)\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.var.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#tuple-declaration-deconstruction-element-list"
+						}
+					]
+				}
+			},
+			"end": "(?==>)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#switch-when-clause"
+				}
+			]
+		},
+		"switch-when-clause": {
+			"begin": "(?<!\\.)\\b(when)\\b\\s*(\\()?",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.try.when.cs"
+				},
+				"2": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "(?==>)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"match": "\\(",
+					"captures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					}
+				},
+				{
+					"match": "\\)",
+					"captures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					}
+				}
+			]
+		},
+		"switch-label": {
+			"patterns": [
+				{
+					"begin": "(?<!\\.)\\b(case)\\b\\s+",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.case.cs"
+						}
+					},
+					"end": ":",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.separator.colon.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"match": "(?<!\\.)\\b(default)\\b\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "keyword.control.default.cs"
+						},
+						"2": {
+							"name": "punctuation.separator.colon.cs"
+						}
+					}
+				}
+			]
+		},
+		"do-statement": {
+			"begin": "(?<!\\.)\\b(do)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.loop.do.cs"
+				}
+			},
+			"end": "(?=;|})",
+			"patterns": [
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"while-statement": {
+			"begin": "(?<!\\.)\\b(while)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.loop.while.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"for-statement": {
+			"begin": "(?<!\\.)\\b(for)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.loop.for.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#local-variable-declaration"
+						},
+						{
+							"include": "#expression"
+						},
+						{
+							"include": "#punctuation-comma"
+						},
+						{
+							"include": "#punctuation-semicolon"
+						}
+					]
+				},
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"foreach-statement": {
+			"begin": "(?<!\\.)\\b(foreach)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.loop.foreach.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"match": "(?x)\n(?:\n  (\\bvar\\b)|\n  (?<type_name>\n    (?:\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\s+\n\\b(in)\\b",
+							"captures": {
+								"1": {
+									"name": "keyword.other.var.cs"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "#type"
+										}
+									]
+								},
+								"7": {
+									"name": "entity.name.variable.local.cs"
+								},
+								"8": {
+									"name": "keyword.control.loop.in.cs"
+								}
+							}
+						},
+						{
+							"match": "(?x) # match foreach (var (x, y) in ...)\n(?:\\b(var)\\b\\s*)?\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s+\n\\b(in)\\b",
+							"captures": {
+								"1": {
+									"name": "keyword.other.var.cs"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "#tuple-declaration-deconstruction-element-list"
+										}
+									]
+								},
+								"3": {
+									"name": "keyword.control.loop.in.cs"
+								}
+							}
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"try-statement": {
+			"patterns": [
+				{
+					"include": "#try-block"
+				},
+				{
+					"include": "#catch-clause"
+				},
+				{
+					"include": "#finally-clause"
+				}
+			]
+		},
+		"try-block": {
+			"begin": "(?<!\\.)\\b(try)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.try.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"finally-clause": {
+			"begin": "(?<!\\.)\\b(finally)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.try.finally.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"catch-clause": {
+			"begin": "(?<!\\.)\\b(catch)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.try.catch.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"match": "(?x)\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s*\n(?:(\\g<identifier>)\\b)?",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#type"
+										}
+									]
+								},
+								"6": {
+									"name": "entity.name.variable.local.cs"
+								}
+							}
+						}
+					]
+				},
+				{
+					"include": "#when-clause"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#block"
+				}
+			]
+		},
+		"when-clause": {
+			"begin": "(?<!\\.)\\b(when)\\b\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.try.when.cs"
+				},
+				"2": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"checked-unchecked-statement": {
+			"begin": "(?<!\\.)\\b(?:(checked)|(unchecked))\\b\\s*(?!\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.checked.cs"
+				},
+				"2": {
+					"name": "keyword.other.unchecked.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#block"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
+		"lock-statement": {
+			"begin": "(?<!\\.)\\b(lock)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.lock.cs"
+				}
+			},
+			"end": "(?<=\\})|(?=;)",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"using-statement": {
+			"begin": "(?<!\\.)\\b(using)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.using.cs"
+				}
+			},
+			"end": "(?=\\;|})",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#local-variable-declaration"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"include": "#statement"
+				}
+			]
+		},
+		"labeled-statement": {
+			"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(:)",
+			"captures": {
+				"1": {
+					"name": "entity.name.label.cs"
+				},
+				"2": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			}
+		},
+		"local-declaration": {
+			"patterns": [
+				{
+					"include": "#local-constant-declaration"
+				},
+				{
+					"include": "#local-variable-declaration"
+				},
+				{
+					"include": "#local-function-declaration"
+				},
+				{
+					"include": "#local-tuple-var-deconstruction"
+				}
+			]
+		},
+		"local-variable-declaration": {
+			"begin": "(?x)\n(?:\n  (?:(\\busing)\\s+)?\n  (?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)| # ref local\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref local\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\s*\n(?!=>)\n(?=,|;|=|\\))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.using.cs"
+				},
+				"2": {
+					"name": "storage.modifier.cs"
+				},
+				"3": {
+					"name": "storage.modifier.cs"
+				},
+				"4": {
+					"name": "keyword.other.var.cs"
+				},
+				"5": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"10": {
+					"name": "entity.name.variable.local.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"name": "entity.name.variable.local.cs",
+					"match": "@?[_[:alpha:]][_[:alnum:]]*"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"local-constant-declaration": {
+			"begin": "(?x)\n(?<const_keyword>\\b(?:const)\\b)\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+\n(\\g<identifier>)\\s*\n(?=,|;|=)",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.local.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"name": "entity.name.variable.local.cs",
+					"match": "@?[_[:alpha:]][_[:alnum:]]*"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"local-function-declaration": {
+			"patterns": [
+				{
+					"include": "#method-declaration"
+				}
+			]
+		},
+		"local-tuple-var-deconstruction": {
+			"begin": "(?x) # e.g. var (x, y) = GetPoint();\n(?:\\b(var)\\b\\s*)\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?=;|=|\\))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.var.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#tuple-declaration-deconstruction-element-list"
+						}
+					]
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"tuple-deconstruction-assignment": {
+			"match": "(?x)\n(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?!=>|==)(?==)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#tuple-deconstruction-element-list"
+						}
+					]
+				}
+			}
+		},
+		"tuple-declaration-deconstruction-element-list": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#tuple-declaration-deconstruction-element-list"
+				},
+				{
+					"include": "#declaration-expression-tuple"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"match": "(?x) # e.g. x\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(?=[,)])",
+					"captures": {
+						"1": {
+							"name": "entity.name.variable.tuple-element.cs"
+						}
+					}
+				}
+			]
+		},
+		"tuple-deconstruction-element-list": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#tuple-deconstruction-element-list"
+				},
+				{
+					"include": "#declaration-expression-tuple"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"match": "(?x) # e.g. x\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(?=[,)])",
+					"captures": {
+						"1": {
+							"name": "variable.other.readwrite.cs"
+						}
+					}
+				}
+			]
+		},
+		"declaration-expression-local": {
+			"match": "(?x) # e.g. int x OR var x\n(?:\n  \\b(var)\\b|\n  (?<type_name>\n    (?:\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\b\\s*\n(?=[,)\\]])",
+			"captures": {
+				"1": {
+					"name": "keyword.other.var.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.local.cs"
+				}
+			}
+		},
+		"declaration-expression-tuple": {
+			"match": "(?x) # e.g. int x OR var x\n(?:\n  \\b(var)\\b|\n  (?<type_name>\n    (?:\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n                (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\b\\s*\n(?=[,)])",
+			"captures": {
+				"1": {
+					"name": "keyword.other.var.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.tuple-element.cs"
+				}
+			}
+		},
+		"checked-unchecked-expression": {
+			"begin": "(?<!\\.)\\b(?:(checked)|(unchecked))\\b\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.checked.cs"
+				},
+				"2": {
+					"name": "keyword.other.unchecked.cs"
+				},
+				"3": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"typeof-or-default-expression": {
+			"begin": "(?<!\\.)\\b(?:(typeof)|(default))\\b\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.typeof.cs"
+				},
+				"2": {
+					"name": "keyword.other.default.cs"
+				},
+				"3": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"nameof-expression": {
+			"begin": "(?<!\\.)\\b(nameof)\\b\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.nameof.cs"
+				},
+				"2": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"default-literal-expression": {
+			"match": "(?<!\\.)\\b(default)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.other.default.cs"
+				}
+			}
+		},
+		"throw-expression": {
+			"match": "(?<!\\.)\\b(throw)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.control.flow.throw.cs"
+				}
+			}
+		},
+		"interpolated-string": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "(\")|((?:[^\\\\\\n])$)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.cs"
+				},
+				"2": {
+					"name": "invalid.illegal.newline.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#string-character-escape"
+				},
+				{
+					"include": "#interpolation"
+				}
+			]
+		},
+		"verbatim-interpolated-string": {
+			"name": "string.quoted.double.cs",
+			"begin": "(?:\\$@|@\\$)\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"(?=[^\"])",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#verbatim-string-character-escape"
+				},
+				{
+					"include": "#interpolation"
+				}
+			]
+		},
+		"interpolation": {
+			"name": "meta.interpolation.cs",
+			"begin": "(?<=[^\\{]|^)((?:\\{\\{)*)(\\{)(?=[^\\{])",
+			"beginCaptures": {
+				"1": {
+					"name": "string.quoted.double.cs"
+				},
+				"2": {
+					"name": "punctuation.definition.interpolation.begin.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.interpolation.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"raw-interpolated-string": {
+			"patterns": [
+				{
+					"include": "#raw-interpolated-string-five-or-more-quote-one-or-more-interpolation"
+				},
+				{
+					"include": "#raw-interpolated-string-three-or-more-quote-three-or-more-interpolation"
+				},
+				{
+					"include": "#raw-interpolated-string-quadruple-quote-double-interpolation"
+				},
+				{
+					"include": "#raw-interpolated-string-quadruple-quote-single-interpolation"
+				},
+				{
+					"include": "#raw-interpolated-string-triple-quote-double-interpolation"
+				},
+				{
+					"include": "#raw-interpolated-string-triple-quote-single-interpolation"
+				}
+			]
+		},
+		"raw-interpolated-string-triple-quote-single-interpolation": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#raw-interpolation"
+				}
+			]
+		},
+		"raw-interpolated-string-triple-quote-double-interpolation": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$\\$\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#double-raw-interpolation"
+				}
+			]
+		},
+		"raw-interpolated-string-quadruple-quote-single-interpolation": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$\"\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#raw-interpolation"
+				}
+			]
+		},
+		"raw-interpolated-string-quadruple-quote-double-interpolation": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$\\$\"\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#double-raw-interpolation"
+				}
+			]
+		},
+		"raw-interpolated-string-three-or-more-quote-three-or-more-interpolation": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$\\$\\$+\"\"\"+",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"+",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			}
+		},
+		"raw-interpolated-string-five-or-more-quote-one-or-more-interpolation": {
+			"name": "string.quoted.double.cs",
+			"begin": "\\$+\"\"\"\"\"+",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"\"\"+",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			}
+		},
+		"raw-interpolation": {
+			"name": "meta.interpolation.cs",
+			"begin": "(?<=[^\\{]|^)((?:\\{)*)(\\{)(?=[^\\{])",
+			"beginCaptures": {
+				"1": {
+					"name": "string.quoted.double.cs"
+				},
+				"2": {
+					"name": "punctuation.definition.interpolation.begin.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.interpolation.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"double-raw-interpolation": {
+			"name": "meta.interpolation.cs",
+			"begin": "(?<=[^\\{][^\\{]|^)((?:\\{)*)(\\{\\{)(?=[^\\{])",
+			"beginCaptures": {
+				"1": {
+					"name": "string.quoted.double.cs"
+				},
+				"2": {
+					"name": "punctuation.definition.interpolation.begin.cs"
+				}
+			},
+			"end": "\\}\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.interpolation.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"literal": {
+			"patterns": [
+				{
+					"include": "#boolean-literal"
+				},
+				{
+					"include": "#null-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#char-literal"
+				},
+				{
+					"include": "#raw-string-literal"
+				},
+				{
+					"include": "#string-literal"
+				},
+				{
+					"include": "#verbatim-string-literal"
+				},
+				{
+					"include": "#tuple-literal"
+				}
+			]
+		},
+		"boolean-literal": {
+			"patterns": [
+				{
+					"name": "constant.language.boolean.true.cs",
+					"match": "(?<!\\.)\\btrue\\b"
+				},
+				{
+					"name": "constant.language.boolean.false.cs",
+					"match": "(?<!\\.)\\bfalse\\b"
+				}
+			]
+		},
+		"null-literal": {
+			"name": "constant.language.null.cs",
+			"match": "(?<!\\.)\\bnull\\b"
+		},
+		"numeric-literal": {
+			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)*",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"begin": "(?=.)",
+							"end": "$",
+							"patterns": [
+								{
+									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?((?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?([fFdDmM](?!\\w))?$",
+									"captures": {
+										"2": {
+											"name": "constant.numeric.decimal.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"3": {
+											"name": "constant.numeric.other.separator.thousands.cs"
+										},
+										"4": {
+											"name": "constant.numeric.other.separator.decimals.cs"
+										},
+										"5": {
+											"name": "constant.numeric.decimal.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"6": {
+											"name": "constant.numeric.other.separator.thousands.cs"
+										},
+										"8": {
+											"name": "constant.numeric.other.exponent.cs"
+										},
+										"9": {
+											"name": "keyword.operator.arithmetic.cs"
+										},
+										"10": {
+											"name": "keyword.operator.arithmetic.cs"
+										},
+										"11": {
+											"name": "constant.numeric.decimal.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"12": {
+											"name": "constant.numeric.other.suffix.cs"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[bB])([01_](?:[01_]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.other.preffix.binary.cs"
+										},
+										"2": {
+											"name": "constant.numeric.binary.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"3": {
+											"name": "constant.numeric.other.separator.thousands.cs"
+										},
+										"4": {
+											"name": "constant.numeric.other.suffix.cs"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.other.preffix.hex.cs"
+										},
+										"2": {
+											"name": "constant.numeric.hex.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"3": {
+											"name": "constant.numeric.other.separator.thousands.cs"
+										},
+										"4": {
+											"name": "constant.numeric.other.suffix.cs"
+										}
+									}
+								},
+								{
+									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$",
+									"captures": {
+										"2": {
+											"name": "constant.numeric.decimal.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"3": {
+											"name": "constant.numeric.other.separator.thousands.cs"
+										},
+										"5": {
+											"name": "constant.numeric.other.exponent.cs"
+										},
+										"6": {
+											"name": "keyword.operator.arithmetic.cs"
+										},
+										"7": {
+											"name": "keyword.operator.arithmetic.cs"
+										},
+										"8": {
+											"name": "constant.numeric.decimal.cs",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+													"name": "constant.numeric.other.separator.thousands.cs"
+												}
+											]
+										},
+										"9": {
+											"name": "constant.numeric.other.suffix.cs"
+										}
+									}
+								},
+								{
+									"match": "(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)+",
+									"name": "invalid.illegal.constant.numeric.cs"
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"char-literal": {
+			"name": "string.quoted.single.cs",
+			"begin": "'",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.char.begin.cs"
+				}
+			},
+			"end": "(\\')|((?:[^\\\\\\n])$)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.char.end.cs"
+				},
+				"2": {
+					"name": "invalid.illegal.newline.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#char-character-escape"
+				}
+			]
+		},
+		"char-character-escape": {
+			"name": "constant.character.escape.cs",
+			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4})"
+		},
+		"string-literal": {
+			"name": "string.quoted.double.cs",
+			"begin": "(?<!@)\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "(\")|((?:[^\\\\\\n])$)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.cs"
+				},
+				"2": {
+					"name": "invalid.illegal.newline.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#string-character-escape"
+				}
+			]
+		},
+		"string-character-escape": {
+			"name": "constant.character.escape.cs",
+			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4})"
+		},
+		"verbatim-string-literal": {
+			"name": "string.quoted.double.cs",
+			"begin": "@\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"(?=[^\"])",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#verbatim-string-character-escape"
+				}
+			]
+		},
+		"verbatim-string-character-escape": {
+			"name": "constant.character.escape.cs",
+			"match": "\"\""
+		},
+		"raw-string-literal": {
+			"patterns": [
+				{
+					"include": "#raw-string-literal-more"
+				},
+				{
+					"include": "#raw-string-literal-quadruple"
+				},
+				{
+					"include": "#raw-string-literal-triple"
+				}
+			]
+		},
+		"raw-string-literal-triple": {
+			"name": "string.quoted.double.cs",
+			"begin": "\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			}
+		},
+		"raw-string-literal-quadruple": {
+			"name": "string.quoted.double.cs",
+			"begin": "\"\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			}
+		},
+		"raw-string-literal-more": {
+			"name": "string.quoted.double.cs",
+			"begin": "\"\"\"\"\"+",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\"\"\"\"\"+",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			}
+		},
+		"tuple-literal": {
+			"begin": "(\\()(?=.*[:,])",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#tuple-literal-element"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"tuple-literal-element": {
+			"begin": "(?x)\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*\n(?=:)",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.variable.tuple-element.cs"
+				}
+			},
+			"end": "(:)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			}
+		},
+		"expression-operators": {
+			"patterns": [
+				{
+					"name": "keyword.operator.assignment.compound.cs",
+					"match": "\\*=|/=|%=|\\+=|-=|\\?\\?="
+				},
+				{
+					"name": "keyword.operator.assignment.compound.bitwise.cs",
+					"match": "\\&=|\\^=|<<=|>>=|\\|="
+				},
+				{
+					"name": "keyword.operator.bitwise.shift.cs",
+					"match": "<<|>>"
+				},
+				{
+					"name": "keyword.operator.comparison.cs",
+					"match": "==|!="
+				},
+				{
+					"name": "keyword.operator.relational.cs",
+					"match": "<=|>=|<|>"
+				},
+				{
+					"name": "keyword.operator.logical.cs",
+					"match": "\\!|&&|\\|\\|"
+				},
+				{
+					"name": "keyword.operator.bitwise.cs",
+					"match": "\\&|~|\\^|\\|"
+				},
+				{
+					"name": "keyword.operator.assignment.cs",
+					"match": "\\="
+				},
+				{
+					"name": "keyword.operator.decrement.cs",
+					"match": "--"
+				},
+				{
+					"name": "keyword.operator.increment.cs",
+					"match": "\\+\\+"
+				},
+				{
+					"name": "keyword.operator.arithmetic.cs",
+					"match": "%|\\*|/|-|\\+"
+				},
+				{
+					"name": "keyword.operator.null-coalescing.cs",
+					"match": "\\?\\?"
+				}
+			]
+		},
+		"switch-literal": {
+			"name": "constant.language.null.cs",
+			"match": "(?<!\\.)\\bnull\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "constant.language.null.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#expression-body"
+				}
+			]
+		},
+		"conditional-operator": {
+			"begin": "\\?(?!\\s*[?.\\[]|\\s*$)",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.conditional.question-mark.cs"
+				}
+			},
+			"end": ":",
+			"endCaptures": {
+				"0": {
+					"name": "keyword.operator.conditional.colon.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"await-expression": {
+			"name": "keyword.other.await.cs",
+			"match": "(?!\\.)\\b(await)\\b"
+		},
+		"parenthesized-expression": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"initializer-expression": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.open.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"identifier": {
+			"name": "variable.other.readwrite.cs",
+			"match": "@?[_[:alpha:]][_[:alnum:]]*"
+		},
+		"cast-expression": {
+			"match": "(?x)\n(\\()\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s*\n(\\))(?=\\s*-*!*@?[_[:alnum:]\\(])",
+			"captures": {
+				"1": {
+					"name": "punctuation.parenthesis.open.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			}
+		},
+		"as-expression": {
+			"match": "(?x)\n(?<!\\.)\\b(as)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?",
+			"captures": {
+				"1": {
+					"name": "keyword.other.as.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			}
+		},
+		"is-expression": {
+			"match": "(?x)\n(?<!\\.)\\b(is)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?",
+			"captures": {
+				"1": {
+					"name": "keyword.other.is.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			}
+		},
+		"this-or-base-expression": {
+			"match": "\\b(?:(base)|(this))\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.other.base.cs"
+				},
+				"2": {
+					"name": "keyword.other.this.cs"
+				}
+			}
+		},
+		"invocation-expression": {
+			"begin": "(?x)\n(?:(\\?)\\s*)?                                     # preceding null-conditional operator?\n(?:(\\.)\\s*)?                                     # preceding dot?\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*                   # method name\n(?<type_args>\\s*<([^<>]|\\g<type_args>)+>\\s*)?\\s* # type arguments\n(?=\\()                                           # open paren of argument list",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.null-conditional.cs"
+				},
+				"2": {
+					"name": "punctuation.accessor.cs"
+				},
+				"3": {
+					"name": "entity.name.function.cs"
+				},
+				"4": {
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\))",
+			"patterns": [
+				{
+					"include": "#argument-list"
+				}
+			]
+		},
+		"element-access-expression": {
+			"begin": "(?x)\n(?:(\\?)\\s*)?                        # preceding null-conditional operator?\n(?:(\\.)\\s*)?                        # preceding dot?\n(?:(@?[_[:alpha:]][_[:alnum:]]*)\\s*)? # property name\n(?:(\\?)\\s*)?                        # null-conditional operator?\n(?=\\[)                              # open bracket of argument list",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.null-conditional.cs"
+				},
+				"2": {
+					"name": "punctuation.accessor.cs"
+				},
+				"3": {
+					"name": "variable.other.object.property.cs"
+				},
+				"4": {
+					"name": "keyword.operator.null-conditional.cs"
+				}
+			},
+			"end": "(?<=\\])(?!\\s*\\[)",
+			"patterns": [
+				{
+					"include": "#bracketed-argument-list"
+				}
+			]
+		},
+		"member-access-expression": {
+			"patterns": [
+				{
+					"match": "(?x)\n(?:(\\?)\\s*)?                   # preceding null-conditional operator?\n(\\.)\\s*                        # preceding dot\n(@?[_[:alpha:]][_[:alnum:]]*)\\s* # property name\n(?![_[:alnum:]]|\\(|(\\?)?\\[|<)  # next character is not alpha-numeric, nor a (, [, or <. Also, test for ?[",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.null-conditional.cs"
+						},
+						"2": {
+							"name": "punctuation.accessor.cs"
+						},
+						"3": {
+							"name": "variable.other.object.property.cs"
+						}
+					}
+				},
+				{
+					"match": "(?x)\n(\\.)?\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\n(?<type_params>\\s*<([^<>]|\\g<type_params>)+>\\s*)\n(?=\n  (\\s*\\?)?\n  \\s*\\.\\s*@?[_[:alpha:]][_[:alnum:]]*\n)",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.cs"
+						},
+						"2": {
+							"name": "variable.other.object.cs"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#type-arguments"
+								}
+							]
+						}
+					}
+				},
+				{
+					"match": "(?x)\n(@?[_[:alpha:]][_[:alnum:]]*)\n(?=\n  (\\s*\\?)?\n  \\s*\\.\\s*@?[_[:alpha:]][_[:alnum:]]*\n)",
+					"captures": {
+						"1": {
+							"name": "variable.other.object.cs"
+						}
+					}
+				}
+			]
+		},
+		"object-creation-expression": {
+			"patterns": [
+				{
+					"include": "#object-creation-expression-with-parameters"
+				},
+				{
+					"include": "#object-creation-expression-with-no-parameters"
+				}
+			]
+		},
+		"object-creation-expression-with-parameters": {
+			"begin": "(?x)\n(new)(?:\\s+\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n))?\\s*\n(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.new.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\))",
+			"patterns": [
+				{
+					"include": "#argument-list"
+				}
+			]
+		},
+		"object-creation-expression-with-no-parameters": {
+			"match": "(?x)\n(new)\\s+\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s*\n(?=\\{|$)",
+			"captures": {
+				"1": {
+					"name": "keyword.other.new.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			}
+		},
+		"array-creation-expression": {
+			"begin": "(?x)\n\\b(new|stackalloc)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?\\s*\n(?=\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.new.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\])",
+			"patterns": [
+				{
+					"include": "#bracketed-argument-list"
+				}
+			]
+		},
+		"anonymous-object-creation-expression": {
+			"begin": "\\b(new)\\b\\s*(?=\\{|$)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.new.cs"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#initializer-expression"
+				}
+			]
+		},
+		"bracketed-parameter-list": {
+			"begin": "(?=(\\[))",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.squarebracket.open.cs"
+				}
+			},
+			"end": "(?=(\\]))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.squarebracket.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(?<=\\[)",
+					"end": "(?=\\])",
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#attribute-section"
+						},
+						{
+							"include": "#parameter"
+						},
+						{
+							"include": "#punctuation-comma"
+						},
+						{
+							"include": "#variable-initializer"
+						}
+					]
+				}
+			]
+		},
+		"parenthesized-parameter-list": {
+			"begin": "(\\()",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#parameter"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
+		"parameter": {
+			"match": "(?x)\n(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?\n(?<type_name>\n  (?:\n    (?:ref\\s+)?   # ref return\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+\n(\\g<identifier>)",
+			"captures": {
+				"1": {
+					"name": "storage.modifier.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.parameter.cs"
+				}
+			}
+		},
+		"argument-list": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#named-argument"
+				},
+				{
+					"include": "#argument"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"bracketed-argument-list": {
+			"begin": "\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.squarebracket.open.cs"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.squarebracket.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#named-argument"
+				},
+				{
+					"include": "#argument"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"named-argument": {
+			"begin": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(:)",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.variable.parameter.cs"
+				},
+				"2": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			},
+			"end": "(?=(,|\\)|\\]))",
+			"patterns": [
+				{
+					"include": "#argument"
+				}
+			]
+		},
+		"argument": {
+			"patterns": [
+				{
+					"name": "storage.modifier.cs",
+					"match": "\\b(ref|out|in)\\b"
+				},
+				{
+					"include": "#declaration-expression-local"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"query-expression": {
+			"begin": "(?x)\n\\b(from)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?\n\\s+(\\g<identifier>)\\b\\s*\n\\b(in)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.from.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.range-variable.cs"
+				},
+				"8": {
+					"name": "keyword.query.in.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"query-body": {
+			"patterns": [
+				{
+					"include": "#let-clause"
+				},
+				{
+					"include": "#where-clause"
+				},
+				{
+					"include": "#join-clause"
+				},
+				{
+					"include": "#orderby-clause"
+				},
+				{
+					"include": "#select-clause"
+				},
+				{
+					"include": "#group-clause"
+				}
+			]
+		},
+		"let-clause": {
+			"begin": "(?x)\n\\b(let)\\b\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(=)\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.let.cs"
+				},
+				"2": {
+					"name": "entity.name.variable.range-variable.cs"
+				},
+				"3": {
+					"name": "keyword.operator.assignment.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"where-clause": {
+			"begin": "(?x)\n\\b(where)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.where.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"join-clause": {
+			"begin": "(?x)\n\\b(join)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?\n\\s+(\\g<identifier>)\\b\\s*\n\\b(in)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.join.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.range-variable.cs"
+				},
+				"8": {
+					"name": "keyword.query.in.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#join-on"
+				},
+				{
+					"include": "#join-equals"
+				},
+				{
+					"include": "#join-into"
+				},
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"join-on": {
+			"match": "\\b(on)\\b\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.query.on.cs"
+				}
+			}
+		},
+		"join-equals": {
+			"match": "\\b(equals)\\b\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.query.equals.cs"
+				}
+			}
+		},
+		"join-into": {
+			"match": "(?x)\n\\b(into)\\b\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.query.into.cs"
+				},
+				"2": {
+					"name": "entity.name.variable.range-variable.cs"
+				}
+			}
+		},
+		"orderby-clause": {
+			"begin": "\\b(orderby)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.orderby.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#ordering-direction"
+				},
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"ordering-direction": {
+			"match": "\\b(?:(ascending)|(descending))\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.query.ascending.cs"
+				},
+				"2": {
+					"name": "keyword.query.descending.cs"
+				}
+			}
+		},
+		"select-clause": {
+			"begin": "\\b(select)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.select.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"group-clause": {
+			"begin": "\\b(group)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.query.group.cs"
+				}
+			},
+			"end": "(?=;|\\))",
+			"patterns": [
+				{
+					"include": "#group-by"
+				},
+				{
+					"include": "#group-into"
+				},
+				{
+					"include": "#query-body"
+				},
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"group-by": {
+			"match": "\\b(by)\\b\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.query.by.cs"
+				}
+			}
+		},
+		"group-into": {
+			"match": "(?x)\n\\b(into)\\b\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.query.into.cs"
+				},
+				"2": {
+					"name": "entity.name.variable.range-variable.cs"
+				}
+			}
+		},
+		"anonymous-method-expression": {
+			"patterns": [
+				{
+					"begin": "(?x)\n(?:\\b(async)\\b\\s*)?\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(=>)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.cs"
+						},
+						"2": {
+							"name": "entity.name.variable.parameter.cs"
+						},
+						"3": {
+							"name": "keyword.operator.arrow.cs"
+						}
+					},
+					"end": "(?=\\)|;|}|,)",
+					"patterns": [
+						{
+							"include": "#block"
+						},
+						{
+							"include": "#ref-modifier"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n(?:\\b(async)\\b\\s*)?\n(\\(.*?\\))\\s*\n(=>)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.cs"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#lambda-parameter-list"
+								}
+							]
+						},
+						"3": {
+							"name": "keyword.operator.arrow.cs"
+						}
+					},
+					"end": "(?=\\)|;|}|,)",
+					"patterns": [
+						{
+							"include": "#block"
+						},
+						{
+							"include": "#ref-modifier"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n(?:\\b(async)\\b\\s*)?\n(?:\\b(delegate)\\b\\s*)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.cs"
+						},
+						"2": {
+							"name": "keyword.other.delegate.cs"
+						}
+					},
+					"end": "(?=\\)|;|}|,)",
+					"patterns": [
+						{
+							"include": "#parenthesized-parameter-list"
+						},
+						{
+							"include": "#block"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				}
+			]
+		},
+		"lambda-parameter-list": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#lambda-parameter"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"lambda-parameter": {
+			"match": "(?x)\n(?:\\b(ref|out|in)\\b)?\\s*\n(?:(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+)?\n(\\g<identifier>)\\b\\s*\n(?=[,)])",
+			"captures": {
+				"1": {
+					"name": "storage.modifier.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.variable.parameter.cs"
+				}
+			}
+		},
+		"type": {
+			"name": "meta.type.cs",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#ref-modifier"
+				},
+				{
+					"include": "#readonly-modifier"
+				},
+				{
+					"include": "#tuple-type"
+				},
+				{
+					"include": "#type-builtin"
+				},
+				{
+					"include": "#type-name"
+				},
+				{
+					"include": "#type-arguments"
+				},
+				{
+					"include": "#type-array-suffix"
+				},
+				{
+					"include": "#type-nullable-suffix"
+				}
+			]
+		},
+		"ref-modifier": {
+			"name": "storage.modifier.cs",
+			"match": "\\b(ref)\\b"
+		},
+		"readonly-modifier": {
+			"name": "storage.modifier.cs",
+			"match": "\\b(readonly)\\b"
+		},
+		"tuple-type": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#tuple-element"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"tuple-element": {
+			"match": "(?x)\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\n(?:(?<tuple_name>\\g<identifier>)\\b)?",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"6": {
+					"name": "entity.name.variable.tuple-element.cs"
+				}
+			}
+		},
+		"type-builtin": {
+			"match": "\\b(bool|byte|char|decimal|double|float|int|long|object|sbyte|short|string|uint|ulong|ushort|void|dynamic)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.type.cs"
+				}
+			}
+		},
+		"type-name": {
+			"patterns": [
+				{
+					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.alias.cs"
+						},
+						"2": {
+							"name": "punctuation.separator.coloncolon.cs"
+						}
+					}
+				},
+				{
+					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.)",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.cs"
+						},
+						"2": {
+							"name": "punctuation.accessor.cs"
+						}
+					}
+				},
+				{
+					"match": "(\\.)\\s*(@?[_[:alpha:]][_[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.cs"
+						},
+						"2": {
+							"name": "entity.name.type.cs"
+						}
+					}
+				},
+				{
+					"name": "entity.name.type.cs",
+					"match": "@?[_[:alpha:]][_[:alnum:]]*"
+				}
+			]
+		},
+		"type-arguments": {
+			"begin": "<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.typeparameters.begin.cs"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.typeparameters.end.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#type"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"type-array-suffix": {
+			"begin": "\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.squarebracket.open.cs"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.squarebracket.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"type-nullable-suffix": {
+			"match": "\\?",
+			"captures": {
+				"0": {
+					"name": "punctuation.separator.question-mark.cs"
+				}
+			}
+		},
+		"operator-assignment": {
+			"name": "keyword.operator.assignment.cs",
+			"match": "(?<!=|!)(=)(?!=)"
+		},
+		"punctuation-comma": {
+			"name": "punctuation.separator.comma.cs",
+			"match": ","
+		},
+		"punctuation-semicolon": {
+			"name": "punctuation.terminator.statement.cs",
+			"match": ";"
+		},
+		"punctuation-accessor": {
+			"name": "punctuation.accessor.cs",
+			"match": "\\."
+		},
+		"preprocessor": {
+			"name": "meta.preprocessor.cs",
+			"begin": "^\\s*(\\#)\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.separator.hash.cs"
+				}
+			},
+			"end": "(?<=$)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#preprocessor-define-or-undef"
+				},
+				{
+					"include": "#preprocessor-if-or-elif"
+				},
+				{
+					"include": "#preprocessor-else-or-endif"
+				},
+				{
+					"include": "#preprocessor-warning-or-error"
+				},
+				{
+					"include": "#preprocessor-region"
+				},
+				{
+					"include": "#preprocessor-endregion"
+				},
+				{
+					"include": "#preprocessor-load"
+				},
+				{
+					"include": "#preprocessor-r"
+				},
+				{
+					"include": "#preprocessor-line"
+				},
+				{
+					"include": "#preprocessor-pragma-warning"
+				},
+				{
+					"include": "#preprocessor-pragma-checksum"
+				}
+			]
+		},
+		"preprocessor-define-or-undef": {
+			"match": "\\b(?:(define)|(undef))\\b\\s*\\b([_[:alpha:]][_[:alnum:]]*)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.define.cs"
+				},
+				"2": {
+					"name": "keyword.preprocessor.undef.cs"
+				},
+				"3": {
+					"name": "entity.name.variable.preprocessor.symbol.cs"
+				}
+			}
+		},
+		"preprocessor-if-or-elif": {
+			"begin": "\\b(?:(if)|(elif))\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.preprocessor.if.cs"
+				},
+				"2": {
+					"name": "keyword.preprocessor.elif.cs"
+				}
+			},
+			"end": "(?=$)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#preprocessor-expression"
+				}
+			]
+		},
+		"preprocessor-else-or-endif": {
+			"match": "\\b(?:(else)|(endif))\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.else.cs"
+				},
+				"2": {
+					"name": "keyword.preprocessor.endif.cs"
+				}
+			}
+		},
+		"preprocessor-warning-or-error": {
+			"match": "\\b(?:(warning)|(error))\\b\\s*(.*)(?=$)",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.warning.cs"
+				},
+				"2": {
+					"name": "keyword.preprocessor.error.cs"
+				},
+				"3": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-load": {
+			"begin": "\\b(load)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.preprocessor.load.cs"
+				}
+			},
+			"end": "(?=$)",
+			"patterns": [
+				{
+					"match": "\\\"[^\"]*\\\"",
+					"captures": {
+						"0": {
+							"name": "string.quoted.double.cs"
+						}
+					}
+				}
+			]
+		},
+		"preprocessor-r": {
+			"begin": "\\b(r)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.preprocessor.r.cs"
+				}
+			},
+			"end": "(?=$)",
+			"patterns": [
+				{
+					"match": "\\\"[^\"]*\\\"",
+					"captures": {
+						"0": {
+							"name": "string.quoted.double.cs"
+						}
+					}
+				}
+			]
+		},
+		"preprocessor-region": {
+			"match": "\\b(region)\\b\\s*(.*)(?=$)",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.region.cs"
+				},
+				"2": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-endregion": {
+			"match": "\\b(endregion)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.endregion.cs"
+				}
+			}
+		},
+		"preprocessor-line": {
+			"begin": "\\b(line)\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.preprocessor.line.cs"
+				}
+			},
+			"end": "(?=$)",
+			"patterns": [
+				{
+					"match": "\\b(?:(default|hidden))",
+					"captures": {
+						"1": {
+							"name": "keyword.preprocessor.default.cs"
+						},
+						"2": {
+							"name": "keyword.preprocessor.hidden.cs"
+						}
+					}
+				},
+				{
+					"match": "[0-9]+",
+					"captures": {
+						"0": {
+							"name": "constant.numeric.decimal.cs"
+						}
+					}
+				},
+				{
+					"match": "\\\"[^\"]*\\\"",
+					"captures": {
+						"0": {
+							"name": "string.quoted.double.cs"
+						}
+					}
+				}
+			]
+		},
+		"preprocessor-pragma-warning": {
+			"match": "\\b(pragma)\\b\\s*\\b(warning)\\b\\s*\\b(?:(disable)|(restore))\\b(\\s*[0-9]+(?:\\s*,\\s*[0-9]+)?)?",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.pragma.cs"
+				},
+				"2": {
+					"name": "keyword.preprocessor.warning.cs"
+				},
+				"3": {
+					"name": "keyword.preprocessor.disable.cs"
+				},
+				"4": {
+					"name": "keyword.preprocessor.restore.cs"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "[0-9]+",
+							"captures": {
+								"0": {
+									"name": "constant.numeric.decimal.cs"
+								}
+							}
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			}
+		},
+		"preprocessor-pragma-checksum": {
+			"match": "\\b(pragma)\\b\\s*\\b(checksum)\\b\\s*(\\\"[^\"]*\\\")\\s*(\\\"[^\"]*\\\")\\s*(\\\"[^\"]*\\\")",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.pragma.cs"
+				},
+				"2": {
+					"name": "keyword.preprocessor.checksum.cs"
+				},
+				"3": {
+					"name": "string.quoted.double.cs"
+				},
+				"4": {
+					"name": "string.quoted.double.cs"
+				},
+				"5": {
+					"name": "string.quoted.double.cs"
+				}
+			}
+		},
+		"preprocessor-expression": {
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor-expression"
+						}
+					]
+				},
+				{
+					"match": "\\b(?:(true)|(false)|([_[:alpha:]][_[:alnum:]]*))\\b",
+					"captures": {
+						"1": {
+							"name": "constant.language.boolean.true.cs"
+						},
+						"2": {
+							"name": "constant.language.boolean.false.cs"
+						},
+						"3": {
+							"name": "entity.name.variable.preprocessor.symbol.cs"
+						}
+					}
+				},
+				{
+					"match": "(==|!=)|(\\!|&&|\\|\\|)",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.comparison.cs"
+						},
+						"2": {
+							"name": "keyword.operator.logical.cs"
+						}
+					}
+				}
+			]
+		},
+		"comment": {
+			"patterns": [
+				{
+					"name": "comment.block.cs",
+					"begin": "/\\*",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.cs"
+						}
+					},
+					"end": "\\*/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.cs"
+						}
+					}
+				},
+				{
+					"begin": "(^\\s+)?(?=//)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.comment.leading.cs"
+						}
+					},
+					"end": "(?=$)",
+					"patterns": [
+						{
+							"name": "comment.block.documentation.cs",
+							"begin": "(?<!/)///(?!/)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.comment.cs"
+								}
+							},
+							"end": "(?=$)",
+							"patterns": [
+								{
+									"include": "#xml-doc-comment"
+								}
+							]
+						},
+						{
+							"name": "comment.line.double-slash.cs",
+							"begin": "(?<!/)//(?:(?!/)|(?=//))",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.comment.cs"
+								}
+							},
+							"end": "(?=$)"
+						}
+					]
+				}
+			]
+		},
+		"xml-doc-comment": {
+			"patterns": [
+				{
+					"include": "#xml-comment"
+				},
+				{
+					"include": "#xml-character-entity"
+				},
+				{
+					"include": "#xml-cdata"
+				},
+				{
+					"include": "#xml-tag"
+				}
+			]
+		},
+		"xml-tag": {
+			"name": "meta.tag.cs",
+			"begin": "(?x)\n(</?)\n(\n  (?:\n    ([-_[:alnum:]]+)\n    (:)\n  )?\n  ([-_[:alnum:]]+)\n)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.tag.cs"
+				},
+				"2": {
+					"name": "entity.name.tag.cs"
+				},
+				"3": {
+					"name": "entity.name.tag.namespace.cs"
+				},
+				"4": {
+					"name": "punctuation.separator.colon.cs"
+				},
+				"5": {
+					"name": "entity.name.tag.localname.cs"
+				}
+			},
+			"end": "(/?>)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.tag.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#xml-attribute"
+				}
+			]
+		},
+		"xml-attribute": {
+			"patterns": [
+				{
+					"match": "(?x)\n(?:^|\\s+)\n(\n  (?:\n    ([-_[:alnum:]]+)\n    (:)\n  )?\n  ([-_[:alnum:]]+)\n)\n(=)",
+					"captures": {
+						"1": {
+							"name": "entity.other.attribute-name.cs"
+						},
+						"2": {
+							"name": "entity.other.attribute-name.namespace.cs"
+						},
+						"3": {
+							"name": "punctuation.separator.colon.cs"
+						},
+						"4": {
+							"name": "entity.other.attribute-name.localname.cs"
+						},
+						"5": {
+							"name": "punctuation.separator.equals.cs"
+						}
+					}
+				},
+				{
+					"include": "#xml-string"
+				}
+			]
+		},
+		"xml-cdata": {
+			"name": "string.unquoted.cdata.cs",
+			"begin": "<!\\[CDATA\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.cs"
+				}
+			},
+			"end": "\\]\\]>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.cs"
+				}
+			}
+		},
+		"xml-string": {
+			"patterns": [
+				{
+					"name": "string.quoted.single.cs",
+					"begin": "\\'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cs"
+						}
+					},
+					"end": "\\'",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#xml-character-entity"
+						}
+					]
+				},
+				{
+					"name": "string.quoted.double.cs",
+					"begin": "\\\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cs"
+						}
+					},
+					"end": "\\\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#xml-character-entity"
+						}
+					]
+				}
+			]
+		},
+		"xml-character-entity": {
+			"patterns": [
+				{
+					"name": "constant.character.entity.cs",
+					"match": "(?x)\n(&)\n(\n  (?:[[:alpha:]:_][[:alnum:]:_.-]*)|\n  (?:\\#[[:digit:]]+)|\n  (?:\\#x[[:xdigit:]]+)\n)\n(;)",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.constant.cs"
+						},
+						"3": {
+							"name": "punctuation.definition.constant.cs"
+						}
+					}
+				},
+				{
+					"name": "invalid.illegal.bad-ampersand.cs",
+					"match": "&"
+				}
+			]
+		},
+		"xml-comment": {
+			"name": "comment.block.cs",
+			"begin": "<!--",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.cs"
+				}
+			},
+			"end": "-->",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.cs"
+				}
+			}
+		}
+	}
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/css.tmLanguage.json b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/css.tmLanguage.json
new file mode 100644
index 000000000..a498115c3
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/css.tmLanguage.json
@@ -0,0 +1,1865 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/microsoft/vscode-css/blob/master/grammars/css.cson",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/microsoft/vscode-css/commit/3bd00206f6b0d16eb2eba53fb886462eb8c58baa",
+	"name": "CSS",
+	"scopeName": "source.css",
+	"patterns": [
+		{
+			"include": "#comment-block"
+		},
+		{
+			"include": "#escapes"
+		},
+		{
+			"include": "#combinators"
+		},
+		{
+			"include": "#selector"
+		},
+		{
+			"include": "#at-rules"
+		},
+		{
+			"include": "#rule-list"
+		}
+	],
+	"repository": {
+		"at-rules": {
+			"patterns": [
+				{
+					"begin": "\\A(?:\\xEF\\xBB\\xBF)?(?i:(?=\\s*@charset\\b))",
+					"end": ";|(?=$)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.terminator.rule.css"
+						}
+					},
+					"name": "meta.at-rule.charset.css",
+					"patterns": [
+						{
+							"captures": {
+								"1": {
+									"name": "invalid.illegal.not-lowercase.charset.css"
+								},
+								"2": {
+									"name": "invalid.illegal.leading-whitespace.charset.css"
+								},
+								"3": {
+									"name": "invalid.illegal.no-whitespace.charset.css"
+								},
+								"4": {
+									"name": "invalid.illegal.whitespace.charset.css"
+								},
+								"5": {
+									"name": "invalid.illegal.not-double-quoted.charset.css"
+								},
+								"6": {
+									"name": "invalid.illegal.unclosed-string.charset.css"
+								},
+								"7": {
+									"name": "invalid.illegal.unexpected-characters.charset.css"
+								}
+							},
+							"match": "(?x)        # Possible errors:\n\\G\n((?!@charset)@\\w+)   # Not lowercase (@charset is case-sensitive)\n|\n\\G(\\s+)             # Preceding whitespace\n|\n(@charset\\S[^;]*)    # No whitespace after @charset\n|\n(?<=@charset)         # Before quoted charset name\n(\\x20{2,}|\\t+)      # More than one space used, or a tab\n|\n(?<=@charset\\x20)    # Beginning of charset name\n([^\";]+)              # Not double-quoted\n|\n(\"[^\"]+$)             # Unclosed quote\n|\n(?<=\")                # After charset name\n([^;]+)               # Unexpected junk instead of semicolon"
+						},
+						{
+							"captures": {
+								"1": {
+									"name": "keyword.control.at-rule.charset.css"
+								},
+								"2": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"match": "((@)charset)(?=\\s)"
+						},
+						{
+							"begin": "\"",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.css"
+								}
+							},
+							"end": "\"|$",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.css"
+								}
+							},
+							"name": "string.quoted.double.css",
+							"patterns": [
+								{
+									"begin": "(?:\\G|^)(?=(?:[^\"])+$)",
+									"end": "$",
+									"name": "invalid.illegal.unclosed.string.css"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)((@)import)(?:\\s+|$|(?=['\"]|/\\*))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.at-rule.import.css"
+						},
+						"2": {
+							"name": "punctuation.definition.keyword.css"
+						}
+					},
+					"end": ";",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.terminator.rule.css"
+						}
+					},
+					"name": "meta.at-rule.import.css",
+					"patterns": [
+						{
+							"begin": "\\G\\s*(?=/\\*)",
+							"end": "(?<=\\*/)\\s*",
+							"patterns": [
+								{
+									"include": "#comment-block"
+								}
+							]
+						},
+						{
+							"include": "#string"
+						},
+						{
+							"include": "#url"
+						},
+						{
+							"include": "#media-query-list"
+						}
+					]
+				},
+				{
+					"begin": "(?i)((@)font-face)(?=\\s*|{|/\\*|$)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.at-rule.font-face.css"
+						},
+						"2": {
+							"name": "punctuation.definition.keyword.css"
+						}
+					},
+					"end": "(?!\\G)",
+					"name": "meta.at-rule.font-face.css",
+					"patterns": [
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#escapes"
+						},
+						{
+							"include": "#rule-list"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(@)page(?=[\\s:{]|/\\*|$)",
+					"captures": {
+						"0": {
+							"name": "keyword.control.at-rule.page.css"
+						},
+						"1": {
+							"name": "punctuation.definition.keyword.css"
+						}
+					},
+					"end": "(?=\\s*($|[:{;]))",
+					"name": "meta.at-rule.page.css",
+					"patterns": [
+						{
+							"include": "#rule-list"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@media(\\s|\\(|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)media",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.media.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*[{;])",
+							"name": "meta.at-rule.media.header.css",
+							"patterns": [
+								{
+									"include": "#media-query-list"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.media.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.media.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.media.body.css",
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@counter-style([\\s'\"{;]|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)counter-style",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.counter-style.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*{)",
+							"name": "meta.at-rule.counter-style.header.css",
+							"patterns": [
+								{
+									"include": "#comment-block"
+								},
+								{
+									"include": "#escapes"
+								},
+								{
+									"captures": {
+										"0": {
+											"patterns": [
+												{
+													"include": "#escapes"
+												}
+											]
+										}
+									},
+									"match": "(?x)\n(?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n(?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n  |\\\\(?:[0-9a-fA-F]{1,6}|.)\n)*",
+									"name": "variable.parameter.style-name.css"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.property-list.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.property-list.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.counter-style.body.css",
+							"patterns": [
+								{
+									"include": "#comment-block"
+								},
+								{
+									"include": "#escapes"
+								},
+								{
+									"include": "#rule-list-innards"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@document([\\s'\"{;]|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)document",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.document.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*[{;])",
+							"name": "meta.at-rule.document.header.css",
+							"patterns": [
+								{
+									"begin": "(?i)(?<![\\w-])(url-prefix|domain|regexp)(\\()",
+									"beginCaptures": {
+										"1": {
+											"name": "support.function.document-rule.css"
+										},
+										"2": {
+											"name": "punctuation.section.function.begin.bracket.round.css"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.section.function.end.bracket.round.css"
+										}
+									},
+									"name": "meta.function.document-rule.css",
+									"patterns": [
+										{
+											"include": "#string"
+										},
+										{
+											"include": "#comment-block"
+										},
+										{
+											"include": "#escapes"
+										},
+										{
+											"match": "[^'\")\\s]+",
+											"name": "variable.parameter.document-rule.css"
+										}
+									]
+								},
+								{
+									"include": "#url"
+								},
+								{
+									"include": "#commas"
+								},
+								{
+									"include": "#comment-block"
+								},
+								{
+									"include": "#escapes"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.document.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.document.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.document.body.css",
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@(?:-(?:webkit|moz|o|ms)-)?keyframes([\\s'\"{;]|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)(?:-(?:webkit|moz|o|ms)-)?keyframes",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.keyframes.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*{)",
+							"name": "meta.at-rule.keyframes.header.css",
+							"patterns": [
+								{
+									"include": "#comment-block"
+								},
+								{
+									"include": "#escapes"
+								},
+								{
+									"captures": {
+										"0": {
+											"patterns": [
+												{
+													"include": "#escapes"
+												}
+											]
+										}
+									},
+									"match": "(?x)\n(?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n(?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n  |\\\\(?:[0-9a-fA-F]{1,6}|.)\n)*",
+									"name": "variable.parameter.keyframe-list.css"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.keyframes.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.keyframes.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.keyframes.body.css",
+							"patterns": [
+								{
+									"include": "#comment-block"
+								},
+								{
+									"include": "#escapes"
+								},
+								{
+									"captures": {
+										"1": {
+											"name": "entity.other.keyframe-offset.css"
+										},
+										"2": {
+											"name": "entity.other.keyframe-offset.percentage.css"
+										}
+									},
+									"match": "(?xi)\n(?<![\\w-]) (from|to) (?![\\w-])         # Keywords for 0% | 100%\n|\n([-+]?(?:\\d+(?:\\.\\d+)?|\\.\\d+)%)     # Percentile value"
+								},
+								{
+									"include": "#rule-list"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@supports(\\s|\\(|/\\*|$))",
+					"end": "(?<=})(?!\\G)|(?=;)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)supports",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.supports.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*[{;])",
+							"name": "meta.at-rule.supports.header.css",
+							"patterns": [
+								{
+									"include": "#feature-query-operators"
+								},
+								{
+									"include": "#feature-query"
+								},
+								{
+									"include": "#comment-block"
+								},
+								{
+									"include": "#escapes"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.supports.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.supports.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.supports.body.css",
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)((@)(-(ms|o)-)?viewport)(?=[\\s'\"{;]|/\\*|$)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.at-rule.viewport.css"
+						},
+						"2": {
+							"name": "punctuation.definition.keyword.css"
+						}
+					},
+					"end": "(?=\\s*[@{;])",
+					"name": "meta.at-rule.viewport.css",
+					"patterns": [
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#escapes"
+						}
+					]
+				},
+				{
+					"begin": "(?i)((@)font-feature-values)(?=[\\s'\"{;]|/\\*|$)\\s*",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.at-rule.font-feature-values.css"
+						},
+						"2": {
+							"name": "punctuation.definition.keyword.css"
+						}
+					},
+					"contentName": "variable.parameter.font-name.css",
+					"end": "(?=\\s*[@{;])",
+					"name": "meta.at-rule.font-features.css",
+					"patterns": [
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#escapes"
+						}
+					]
+				},
+				{
+					"include": "#font-features"
+				},
+				{
+					"begin": "(?i)((@)namespace)(?=[\\s'\";]|/\\*|$)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.at-rule.namespace.css"
+						},
+						"2": {
+							"name": "punctuation.definition.keyword.css"
+						}
+					},
+					"end": ";|(?=[@{])",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.terminator.rule.css"
+						}
+					},
+					"name": "meta.at-rule.namespace.css",
+					"patterns": [
+						{
+							"include": "#url"
+						},
+						{
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#comment-block"
+										}
+									]
+								},
+								"2": {
+									"name": "entity.name.function.namespace-prefix.css",
+									"patterns": [
+										{
+											"include": "#escapes"
+										}
+									]
+								}
+							},
+							"match": "(?xi)\n(?:\\G|^|(?<=\\s))\n(?=\n  (?<=\\s|^)                             # Starts with whitespace\n  (?:[-a-zA-Z_]|[^\\x00-\\x7F])          # Then a valid identifier character\n  |\n  \\s*                                   # Possible adjoining whitespace\n  /\\*(?:[^*]|\\*[^/])*\\*/              # Injected comment\n)\n(.*?)                                    # Grouped to embed #comment-block\n(\n  (?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n  (?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n    |\\\\(?:[0-9a-fA-F]{1,6}|.)\n  )*\n)"
+						},
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#escapes"
+						},
+						{
+							"include": "#string"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@[\\w-]+[^;]+;s*$)",
+					"end": "(?<=;)(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)[\\w-]+",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": ";",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.terminator.rule.css"
+								}
+							},
+							"name": "meta.at-rule.header.css"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)[\\w-]+",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*[{;])",
+							"name": "meta.at-rule.header.css"
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.body.css",
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"color-keywords": {
+			"patterns": [
+				{
+					"match": "(?i)(?<![\\w-])(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)(?![\\w-])",
+					"name": "support.constant.color.w3c-standard-color-name.css"
+				},
+				{
+					"match": "(?xi) (?<![\\w-])\n(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood\n|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan\n|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange\n|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise\n|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen\n|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki\n|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow\n|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray\n|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue\n|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise\n|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered\n|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum\n|powderblue|rebeccapurple|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell\n|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato\n|transparent|turquoise|violet|wheat|whitesmoke|yellowgreen)\n(?![\\w-])",
+					"name": "support.constant.color.w3c-extended-color-name.css"
+				},
+				{
+					"match": "(?i)(?<![\\w-])currentColor(?![\\w-])",
+					"name": "support.constant.color.current.css"
+				},
+				{
+					"match": "(?xi) (?<![\\w-])\n(ActiveBorder|ActiveCaption|AppWorkspace|Background|ButtonFace|ButtonHighlight|ButtonShadow\n|ButtonText|CaptionText|GrayText|Highlight|HighlightText|InactiveBorder|InactiveCaption\n|InactiveCaptionText|InfoBackground|InfoText|Menu|MenuText|Scrollbar|ThreeDDarkShadow\n|ThreeDFace|ThreeDHighlight|ThreeDLightShadow|ThreeDShadow|Window|WindowFrame|WindowText)\n(?![\\w-])",
+					"name": "invalid.deprecated.color.system.css"
+				}
+			]
+		},
+		"combinators": {
+			"patterns": [
+				{
+					"match": "/deep/|>>>",
+					"name": "invalid.deprecated.combinator.css"
+				},
+				{
+					"match": ">>|>|\\+|~",
+					"name": "keyword.operator.combinator.css"
+				}
+			]
+		},
+		"commas": {
+			"match": ",",
+			"name": "punctuation.separator.list.comma.css"
+		},
+		"comment-block": {
+			"begin": "/\\*",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.begin.css"
+				}
+			},
+			"end": "\\*/",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.end.css"
+				}
+			},
+			"name": "comment.block.css"
+		},
+		"escapes": {
+			"patterns": [
+				{
+					"match": "\\\\[0-9a-fA-F]{1,6}",
+					"name": "constant.character.escape.codepoint.css"
+				},
+				{
+					"begin": "\\\\$\\s*",
+					"end": "^(?<!\\G)",
+					"name": "constant.character.escape.newline.css"
+				},
+				{
+					"match": "\\\\.",
+					"name": "constant.character.escape.css"
+				}
+			]
+		},
+		"feature-query": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.condition.begin.bracket.round.css"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.condition.end.bracket.round.css"
+				}
+			},
+			"name": "meta.feature-query.css",
+			"patterns": [
+				{
+					"include": "#feature-query-operators"
+				},
+				{
+					"include": "#feature-query"
+				}
+			]
+		},
+		"feature-query-operators": {
+			"patterns": [
+				{
+					"match": "(?i)(?<=[\\s()]|^|\\*/)(and|not|or)(?=[\\s()]|/\\*|$)",
+					"name": "keyword.operator.logical.feature.$1.css"
+				},
+				{
+					"include": "#rule-list-innards"
+				}
+			]
+		},
+		"font-features": {
+			"begin": "(?xi)\n((@)(annotation|character-variant|ornaments|styleset|stylistic|swash))\n(?=[\\s@'\"{;]|/\\*|$)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.at-rule.${3:/downcase}.css"
+				},
+				"2": {
+					"name": "punctuation.definition.keyword.css"
+				}
+			},
+			"end": "(?<=})",
+			"name": "meta.at-rule.${3:/downcase}.css",
+			"patterns": [
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.property-list.begin.bracket.curly.css"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.property-list.end.bracket.curly.css"
+						}
+					},
+					"name": "meta.property-list.font-feature.css",
+					"patterns": [
+						{
+							"captures": {
+								"0": {
+									"patterns": [
+										{
+											"include": "#escapes"
+										}
+									]
+								}
+							},
+							"match": "(?x)\n(?: [-a-zA-Z_]    | [^\\x00-\\x7F] )   # First letter\n(?: [-a-zA-Z0-9_] | [^\\x00-\\x7F]     # Remainder of identifier\n  | \\\\(?:[0-9a-fA-F]{1,6}|.)\n)*",
+							"name": "variable.font-feature.css"
+						},
+						{
+							"include": "#rule-list-innards"
+						}
+					]
+				}
+			]
+		},
+		"functions": {
+			"patterns": [
+				{
+					"begin": "(?i)(?<![\\w-])(calc)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.calc.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.calc.css",
+					"patterns": [
+						{
+							"match": "[*/]|(?<=\\s|^)[-+](?=\\s|$)",
+							"name": "keyword.operator.arithmetic.css"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?<![\\w-])(rgba?|rgb|hsla?|hsl|hwb|lab|oklab|lch|oklch|color)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.misc.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.color.css",
+					"patterns": [
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?xi) (?<![\\w-])\n(\n  (?:-webkit-|-moz-|-o-)?    # Accept prefixed/historical variants\n  (?:repeating-)?            # \"Repeating\"-type gradient\n  (?:linear|radial|conic)    # Shape\n  -gradient\n)\n(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.gradient.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.gradient.css",
+					"patterns": [
+						{
+							"match": "(?i)(?<![\\w-])(from|to|at|in|hue)(?![\\w-])",
+							"name": "keyword.operator.gradient.css"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?<![\\w-])(-webkit-gradient)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "invalid.deprecated.gradient.function.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.gradient.invalid.deprecated.gradient.css",
+					"patterns": [
+						{
+							"begin": "(?i)(?<![\\w-])(from|to|color-stop)(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "invalid.deprecated.function.css"
+								},
+								"2": {
+									"name": "punctuation.section.function.begin.bracket.round.css"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.function.end.bracket.round.css"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#property-values"
+								}
+							]
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?xi) (?<![\\w-])\n(annotation|attr|blur|brightness|character-variant|clamp|contrast|counters?\n|cross-fade|drop-shadow|element|fit-content|format|grayscale|hue-rotate|color-mix\n|image-set|invert|local|max|min|minmax|opacity|ornaments|repeat|saturate|sepia\n|styleset|stylistic|swash|symbols\n|cos|sin|tan|acos|asin|atan|atan2|hypot|sqrt|pow|log|exp|abs|sign)\n(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.misc.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.misc.css",
+					"patterns": [
+						{
+							"match": "(?i)(?<=[,\\s\"]|\\*/|^)\\d+x(?=[\\s,\"')]|/\\*|$)",
+							"name": "constant.numeric.other.density.css"
+						},
+						{
+							"include": "#property-values"
+						},
+						{
+							"match": "[^'\"),\\s]+",
+							"name": "variable.parameter.misc.css"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?<![\\w-])(circle|ellipse|inset|polygon|rect)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.shape.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.shape.css",
+					"patterns": [
+						{
+							"match": "(?i)(?<=\\s|^|\\*/)(at|round)(?=\\s|/\\*|$)",
+							"name": "keyword.operator.shape.css"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(?<![\\w-])(cubic-bezier|steps)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.timing-function.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.timing-function.css",
+					"patterns": [
+						{
+							"match": "(?i)(?<![\\w-])(start|end)(?=\\s*\\)|$)",
+							"name": "support.constant.step-direction.css"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?xi) (?<![\\w-])\n( (?:translate|scale|rotate)(?:[XYZ]|3D)?\n| matrix(?:3D)?\n| skew[XY]?\n| perspective\n)\n(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.transform.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"include": "#url"
+				},
+				{
+					"begin": "(?i)(?<![\\w-])(var)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.misc.css"
+						},
+						"2": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"name": "meta.function.variable.css",
+					"patterns": [
+						{
+							"name": "variable.argument.css",
+							"match": "(?x)\n--\n(?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n(?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n  |\\\\(?:[0-9a-fA-F]{1,6}|.)\n)*"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				}
+			]
+		},
+		"functional-pseudo-classes": {
+			"patterns": [
+				{
+					"begin": "(?i)((:)dir)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.other.attribute-name.pseudo-class.css"
+						},
+						"2": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"3": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#escapes"
+						},
+						{
+							"match": "(?i)(?<![\\w-])(ltr|rtl)(?![\\w-])",
+							"name": "support.constant.text-direction.css"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"begin": "(?i)((:)lang)(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.other.attribute-name.pseudo-class.css"
+						},
+						"2": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"3": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"patterns": [
+						{
+							"match": "(?<=[(,\\s])[a-zA-Z]+(-[a-zA-Z0-9]*|\\\\(?:[0-9a-fA-F]{1,6}|.))*(?=[),\\s])",
+							"name": "support.constant.language-range.css"
+						},
+						{
+							"begin": "\"",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.css"
+								}
+							},
+							"end": "\"",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.css"
+								}
+							},
+							"name": "string.quoted.double.css",
+							"patterns": [
+								{
+									"include": "#escapes"
+								},
+								{
+									"match": "(?<=[\"\\s])[a-zA-Z*]+(-[a-zA-Z0-9*]*)*(?=[\"\\s])",
+									"name": "support.constant.language-range.css"
+								}
+							]
+						},
+						{
+							"begin": "'",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.css"
+								}
+							},
+							"end": "'",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.css"
+								}
+							},
+							"name": "string.quoted.single.css",
+							"patterns": [
+								{
+									"include": "#escapes"
+								},
+								{
+									"match": "(?<=['\\s])[a-zA-Z*]+(-[a-zA-Z0-9*]*)*(?=['\\s])",
+									"name": "support.constant.language-range.css"
+								}
+							]
+						},
+						{
+							"include": "#commas"
+						}
+					]
+				},
+				{
+					"begin": "(?i)((:)(?:not|has|matches|where|is))(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.other.attribute-name.pseudo-class.css"
+						},
+						"2": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"3": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#selector-innards"
+						}
+					]
+				},
+				{
+					"begin": "(?i)((:)nth-(?:last-)?(?:child|of-type))(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.other.attribute-name.pseudo-class.css"
+						},
+						"2": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"3": {
+							"name": "punctuation.section.function.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.function.end.bracket.round.css"
+						}
+					},
+					"patterns": [
+						{
+							"match": "(?i)[+-]?(\\d+n?|n)(\\s*[+-]\\s*\\d+)?",
+							"name": "constant.numeric.css"
+						},
+						{
+							"match": "(?i)even|odd",
+							"name": "support.constant.parity.css"
+						}
+					]
+				}
+			]
+		},
+		"media-features": {
+			"captures": {
+				"1": {
+					"name": "support.type.property-name.media.css"
+				},
+				"2": {
+					"name": "support.type.property-name.media.css"
+				},
+				"3": {
+					"name": "support.type.vendored.property-name.media.css"
+				}
+			},
+			"match": "(?xi)\n(?<=^|\\s|\\(|\\*/)           # Preceded by whitespace, bracket or comment\n(?:\n  # Standardised features\n  (\n    (?:min-|max-)?            # Range features\n    (?: height\n      | width\n      | aspect-ratio\n      | color\n      | color-index\n      | monochrome\n      | resolution\n    )\n    | grid                    # Discrete features\n    | scan\n    | orientation\n    | display-mode\n    | hover\n  )\n  |\n  # Deprecated features\n  (\n    (?:min-|max-)?            # Deprecated in Media Queries 4\n    device-\n    (?: height\n      | width\n      | aspect-ratio\n    )\n  )\n  |\n  # Vendor extensions\n  (\n    (?:\n      # Spec-compliant syntax\n      [-_]\n      (?: webkit              # Webkit/Blink\n        | apple|khtml         # Webkit aliases\n        | epub                # ePub3\n        | moz                 # Gecko\n        | ms                  # Microsoft\n        | o                   # Presto (pre-Opera 15)\n        | xv|ah|rim|atsc|     # Less common vendors\n          hp|tc|wap|ro\n      )\n      |\n      # Non-standard prefixes\n      (?: mso                 # Microsoft Office\n        | prince              # YesLogic\n      )\n    )\n    -\n    [\\w-]+                   # Feature name\n    (?=                       # Terminates correctly\n      \\s*                    # Possible whitespace\n      (?:                     # Possible injected comment\n        /\\*\n        (?:[^*]|\\*[^/])*\n        \\*/\n      )?\n      \\s*\n      [:)]                    # Ends with a colon or closed bracket\n    )\n  )\n)\n(?=\\s|$|[><:=]|\\)|/\\*)     # Terminates cleanly"
+		},
+		"media-feature-keywords": {
+			"match": "(?xi)\n(?<=^|\\s|:|\\*/)\n(?: portrait                  # Orientation\n  | landscape\n  | progressive               # Scan types\n  | interlace\n  | fullscreen                # Display modes\n  | standalone\n  | minimal-ui\n  | browser\n  | hover\n)\n(?=\\s|\\)|$)",
+			"name": "support.constant.property-value.css"
+		},
+		"media-query": {
+			"begin": "\\G",
+			"end": "(?=\\s*[{;])",
+			"patterns": [
+				{
+					"include": "#comment-block"
+				},
+				{
+					"include": "#escapes"
+				},
+				{
+					"include": "#media-types"
+				},
+				{
+					"match": "(?i)(?<=\\s|^|,|\\*/)(only|not)(?=\\s|{|/\\*|$)",
+					"name": "keyword.operator.logical.$1.media.css"
+				},
+				{
+					"match": "(?i)(?<=\\s|^|\\*/|\\))and(?=\\s|/\\*|$)",
+					"name": "keyword.operator.logical.and.media.css"
+				},
+				{
+					"match": ",(?:(?:\\s*,)+|(?=\\s*[;){]))",
+					"name": "invalid.illegal.comma.css"
+				},
+				{
+					"include": "#commas"
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.begin.bracket.round.css"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.end.bracket.round.css"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#media-features"
+						},
+						{
+							"include": "#media-feature-keywords"
+						},
+						{
+							"match": ":",
+							"name": "punctuation.separator.key-value.css"
+						},
+						{
+							"match": ">=|<=|=|<|>",
+							"name": "keyword.operator.comparison.css"
+						},
+						{
+							"captures": {
+								"1": {
+									"name": "constant.numeric.css"
+								},
+								"2": {
+									"name": "keyword.operator.arithmetic.css"
+								},
+								"3": {
+									"name": "constant.numeric.css"
+								}
+							},
+							"match": "(\\d+)\\s*(/)\\s*(\\d+)",
+							"name": "meta.ratio.css"
+						},
+						{
+							"include": "#numeric-values"
+						},
+						{
+							"include": "#comment-block"
+						}
+					]
+				}
+			]
+		},
+		"media-query-list": {
+			"begin": "(?=\\s*[^{;])",
+			"end": "(?=\\s*[{;])",
+			"patterns": [
+				{
+					"include": "#media-query"
+				}
+			]
+		},
+		"media-types": {
+			"captures": {
+				"1": {
+					"name": "support.constant.media.css"
+				},
+				"2": {
+					"name": "invalid.deprecated.constant.media.css"
+				}
+			},
+			"match": "(?xi)\n(?<=^|\\s|,|\\*/)\n(?:\n  # Valid media types\n  (all|print|screen|speech)\n  |\n  # Deprecated in Media Queries 4: http://dev.w3.org/csswg/mediaqueries/#media-types\n  (aural|braille|embossed|handheld|projection|tty|tv)\n)\n(?=$|[{,\\s;]|/\\*)"
+		},
+		"numeric-values": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.constant.css"
+						}
+					},
+					"match": "(#)(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+					"name": "constant.other.color.rgb-value.hex.css"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "keyword.other.unit.percentage.css"
+						},
+						"2": {
+							"name": "keyword.other.unit.${2:/downcase}.css"
+						}
+					},
+					"match": "(?xi) (?<![\\w-])\n[-+]?                               # Sign indicator\n\n(?:                                 # Numerals\n    [0-9]+ (?:\\.[0-9]+)?           # Integer/float with leading digits\n  | \\.[0-9]+                       # Float without leading digits\n)\n\n(?:                                 # Scientific notation\n  (?<=[0-9])                        # Exponent must follow a digit\n  E                                 # Exponent indicator\n  [-+]?                             # Possible sign indicator\n  [0-9]+                            # Exponent value\n)?\n\n(?:                                 # Possible unit for data-type:\n  (%)                               # - Percentage\n  | ( deg|grad|rad|turn             # - Angle\n    | Hz|kHz                        # - Frequency\n    | ch|cm|em|ex|fr|in|mm|mozmm|   # - Length\n      pc|pt|px|q|rem|rch|rex|rlh|\n      ic|ric|rcap|vh|vw|vb|vi|svh|\n      svw|svb|svi|dvh|dvw|dvb|dvi|\n      lvh|lvw|lvb|lvi|vmax|vmin|\n      cqw|cqi|cqh|cqb|cqmin|cqmax\n    | dpi|dpcm|dppx                 # - Resolution\n    | s|ms                          # - Time\n    )\n  \\b                               # Boundary checking intentionally lax to\n)?                                  # facilitate embedding in CSS-like grammars",
+					"name": "constant.numeric.css"
+				}
+			]
+		},
+		"property-keywords": {
+			"patterns": [
+				{
+					"match": "(?xi) (?<![\\w-])\n(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse\n|always|antialiased|auto|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel\n|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets\n|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn\n|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover\n|crisp-edges|crispEdges|crosshair|cyclic|dark|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures\n|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in\n|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded\n|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|flow-root|forwards|freeze\n|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide\n|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space\n|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start\n|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83\n|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|light|lighten|lighter|line|line-edge|line-through|linear|linearRGB\n|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent\n|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize\n|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures\n|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize\n|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding\n|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line\n|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]\n|reset-size|reverse|revert|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text\n|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|se-resize|semi-condensed|semi-expanded|separate\n|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller\n|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap\n|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table\n|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl\n|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle\n|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical\n|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy\n|weight|whitespace|wider|words|wrap|wrap-reverse|x|x-large|x-small|xx-large|xx-small|y|zero|zoom-in|zoom-out)\n(?![\\w-])",
+					"name": "support.constant.property-value.css"
+				},
+				{
+					"match": "(?xi) (?<![\\w-])\n(arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|cjk-ideographic\n|decimal|decimal-leading-zero|devanagari|disc|disclosure-closed|disclosure-open|ethiopic-halehame-am\n|ethiopic-halehame-ti-e[rt]|ethiopic-numeric|georgian|gujarati|gurmukhi|hangul|hangul-consonant|hebrew\n|hiragana|hiragana-iroha|japanese-formal|japanese-informal|kannada|katakana|katakana-iroha|khmer\n|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek\n|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal\n|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian\n|upper-latin|upper-roman|urdu)\n(?![\\w-])",
+					"name": "support.constant.property-value.list-style-type.css"
+				},
+				{
+					"match": "(?<![\\w-])(?i:-(?:ah|apple|atsc|epub|hp|khtml|moz|ms|o|rim|ro|tc|wap|webkit|xv)|(?:mso|prince))-[a-zA-Z-]+",
+					"name": "support.constant.vendored.property-value.css"
+				},
+				{
+					"match": "(?<![\\w-])(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system-ui|system|tahoma|times|trebuchet|ui-monospace|ui-rounded|ui-sans-serif|ui-serif|utopia|verdana|webdings|sans-serif|serif|monospace)(?![\\w-])",
+					"name": "support.constant.font-name.css"
+				}
+			]
+		},
+		"property-names": {
+			"patterns": [
+				{
+					"match": "(?xi) (?<![\\w-])\n(?:\n  # Standard CSS\n  accent-color|additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction|animation-duration\n  | animation-fill-mode|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|backdrop-filter\n  | backface-visibility|background|background-attachment|background-blend-mode|background-clip|background-color|background-image\n  | background-origin|background-position|background-position-[xy]|background-repeat|background-size|bleed|block-size|border\n  | border-block-end|border-block-end-color|border-block-end-style|border-block-end-width|border-block-start|border-block-start-color\n  | border-block-start-style|border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius\n  | border-bottom-style|border-bottom-width|border-collapse|border-color|border-end-end-radius|border-end-start-radius|border-image\n  | border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end\n  | border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start|border-inline-start-color\n  | border-inline-start-style|border-inline-start-width|border-left|border-left-color|border-left-style|border-left-width\n  | border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-start-end-radius\n  | border-start-start-radius|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style\n  | border-top-width|border-width|bottom|box-decoration-break|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side\n  | caret-color|clear|clip|clip-path|clip-rule|color|color-adjust|color-interpolation-filters|color-scheme|column-count|column-fill|column-gap\n  | column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|contain|content|counter-increment\n  | counter-reset|cursor|direction|display|empty-cells|enable-background|fallback|fill|fill-opacity|fill-rule|filter|flex|flex-basis\n  | flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float|flood-color|flood-opacity|font|font-display|font-family\n  | font-feature-settings|font-kerning|font-language-override|font-optical-sizing|font-size|font-size-adjust|font-stretch\n  | font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps|font-variant-east-asian|font-variant-ligatures\n  | font-variant-numeric|font-variant-position|font-variation-settings|font-weight|gap|glyph-orientation-horizontal|glyph-orientation-vertical\n  | grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap|grid-column-start\n  | grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows\n  | hanging-punctuation|height|hyphens|image-orientation|image-rendering|image-resolution|ime-mode|initial-letter|initial-letter-align\n  | inline-size|inset|inset-block|inset-block-end|inset-block-start|inset-inline|inset-inline-end|inset-inline-start|isolation\n  | justify-content|justify-items|justify-self|kerning|left|letter-spacing|lighting-color|line-break|line-clamp|line-height|list-style\n  | list-style-image|list-style-position|list-style-type|margin|margin-block|margin-block-end|margin-block-start|margin-bottom|margin-inline|margin-inline-end|margin-inline-start\n  | margin-left|margin-right|margin-top|marker-end|marker-mid|marker-start|marks|mask|mask-border|mask-border-mode|mask-border-outset\n  | mask-border-repeat|mask-border-slice|mask-border-source|mask-border-width|mask-clip|mask-composite|mask-image|mask-mode\n  | mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height|max-inline-size|max-lines|max-width\n  | max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode|negative|object-fit|object-position\n  | offset|offset-anchor|offset-distance|offset-path|offset-position|offset-rotation|opacity|order|orientation|orphans\n  | outline|outline-color|outline-offset|outline-style|outline-width|overflow|overflow-anchor|overflow-block|overflow-inline\n  | overflow-wrap|overflow-[xy]|overscroll-behavior|overscroll-behavior-block|overscroll-behavior-inline|overscroll-behavior-[xy]\n  | pad|padding|padding-block|padding-block-end|padding-block-start|padding-bottom|padding-inline|padding-inline-end|padding-inline-start|padding-left\n  | padding-right|padding-top|page-break-after|page-break-before|page-break-inside|paint-order|perspective|perspective-origin\n  | place-content|place-items|place-self|pointer-events|position|prefix|quotes|range|resize|right|rotate|row-gap|ruby-align\n  | ruby-merge|ruby-position|scale|scroll-behavior|scroll-margin|scroll-margin-block|scroll-margin-block-end|scroll-margin-block-start\n  | scroll-margin-bottom|scroll-margin-inline|scroll-margin-inline-end|scroll-margin-inline-start|scroll-margin-left|scroll-margin-right\n  | scroll-margin-top|scroll-padding|scroll-padding-block|scroll-padding-block-end|scroll-padding-block-start|scroll-padding-bottom\n  | scroll-padding-inline|scroll-padding-inline-end|scroll-padding-inline-start|scroll-padding-left|scroll-padding-right\n  | scroll-padding-top|scroll-snap-align|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-stop|scroll-snap-type\n  | scrollbar-color|scrollbar-gutter|scrollbar-width|shape-image-threshold|shape-margin|shape-outside|shape-rendering|size\n  | speak-as|src|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap|stroke-linejoin|stroke-miterlimit\n  | stroke-opacity|stroke-width|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last|text-anchor|text-combine-upright\n  | text-decoration|text-decoration-color|text-decoration-line|text-decoration-skip|text-decoration-skip-ink|text-decoration-style|text-decoration-thickness\n  | text-emphasis|text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-justify|text-orientation\n  | text-overflow|text-rendering|text-shadow|text-size-adjust|text-transform|text-underline-offset|text-underline-position|top|touch-action|transform\n  | transform-box|transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property|transition-timing-function\n  | translate|unicode-bidi|unicode-range|user-select|user-zoom|vertical-align|visibility|white-space|widows|width|will-change\n  | word-break|word-spacing|word-wrap|writing-mode|z-index|zoom\n\n  # SVG attributes\n  | alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile\n  | color-rendering|cx|cy|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity\n  | glyph-orientation-horizontal|glyph-orientation-vertical|height|kerning|lighting-color|marker-end|marker-mid\n  | marker-start|r|rx|ry|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap\n  | stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|width|x|y\n\n  # Not listed on MDN; presumably deprecated\n  | adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break\n  | balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length\n  | bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction\n  | box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column\n  | column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break\n  | delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust\n  | drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position\n  | flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before\n  | hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust\n  | initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count\n  | justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift\n  | line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed\n  | marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group\n  | orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range\n  | play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim\n  | radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness\n  | right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color\n  | rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral\n  | speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch\n  | string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height\n  | text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style\n  | top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range\n  | voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap\n)\n(?![\\w-])",
+					"name": "support.type.property-name.css"
+				},
+				{
+					"match": "(?<![\\w-])(?i:-(?:ah|apple|atsc|epub|hp|khtml|moz|ms|o|rim|ro|tc|wap|webkit|xv)|(?:mso|prince))-[a-zA-Z-]+",
+					"name": "support.type.vendored.property-name.css"
+				}
+			]
+		},
+		"property-values": {
+			"patterns": [
+				{
+					"include": "#commas"
+				},
+				{
+					"include": "#comment-block"
+				},
+				{
+					"include": "#escapes"
+				},
+				{
+					"include": "#functions"
+				},
+				{
+					"include": "#property-keywords"
+				},
+				{
+					"include": "#unicode-range"
+				},
+				{
+					"include": "#numeric-values"
+				},
+				{
+					"include": "#color-keywords"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"match": "!\\s*important(?![\\w-])",
+					"name": "keyword.other.important.css"
+				}
+			]
+		},
+		"pseudo-classes": {
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.entity.css"
+				},
+				"2": {
+					"name": "invalid.illegal.colon.css"
+				}
+			},
+			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within|fullscreen|host|hover\n  | in-range|indeterminate|invalid|left|link|optional|out-of-range\n  | read-only|read-write|required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
+			"name": "entity.other.attribute-name.pseudo-class.css"
+		},
+		"pseudo-elements": {
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.entity.css"
+				},
+				"2": {
+					"name": "punctuation.definition.entity.css"
+				}
+			},
+			"match": "(?xi)\n(?:\n  (::?)                       # Elements using both : and :: notation\n  (?: after\n    | before\n    | first-letter\n    | first-line\n    | (?:-(?:ah|apple|atsc|epub|hp|khtml|moz\n            |ms|o|rim|ro|tc|wap|webkit|xv)\n        | (?:mso|prince))\n      -[a-z-]+\n  )\n  |\n  (::)                        # Double-colon only\n  (?: backdrop\n    | content\n    | grammar-error\n    | marker\n    | placeholder\n    | selection\n    | shadow\n    | spelling-error\n  )\n)\n(?![\\w-]|\\s*[;}])",
+			"name": "entity.other.attribute-name.pseudo-element.css"
+		},
+		"rule-list": {
+			"begin": "{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.property-list.begin.bracket.curly.css"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.property-list.end.bracket.curly.css"
+				}
+			},
+			"name": "meta.property-list.css",
+			"patterns": [
+				{
+					"include": "#rule-list-innards"
+				}
+			]
+		},
+		"rule-list-innards": {
+			"patterns": [
+				{
+					"include": "#comment-block"
+				},
+				{
+					"include": "#escapes"
+				},
+				{
+					"include": "#font-features"
+				},
+				{
+					"match": "(?x) (?<![\\w-])\n--\n(?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n(?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n  |\\\\(?:[0-9a-fA-F]{1,6}|.)\n)*",
+					"name": "variable.css"
+				},
+				{
+					"begin": "(?<![-a-zA-Z])(?=[-a-zA-Z])",
+					"end": "$|(?![-a-zA-Z])",
+					"name": "meta.property-name.css",
+					"patterns": [
+						{
+							"include": "#property-names"
+						}
+					]
+				},
+				{
+					"begin": "(:)\\s*",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.separator.key-value.css"
+						}
+					},
+					"end": "\\s*(;)|\\s*(?=}|\\))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.rule.css"
+						}
+					},
+					"contentName": "meta.property-value.css",
+					"patterns": [
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#property-values"
+						}
+					]
+				},
+				{
+					"match": ";",
+					"name": "punctuation.terminator.rule.css"
+				}
+			]
+		},
+		"selector": {
+			"begin": "(?x)\n(?=\n  (?:\\|)?                    # Possible anonymous namespace prefix\n  (?:\n    [-\\[:.*\\#a-zA-Z_]       # Valid selector character\n    |\n    [^\\x00-\\x7F]            # Which can include non-ASCII symbols\n    |\n    \\\\                      # Or an escape sequence\n    (?:[0-9a-fA-F]{1,6}|.)\n  )\n)",
+			"end": "(?=\\s*[/@{)])",
+			"name": "meta.selector.css",
+			"patterns": [
+				{
+					"include": "#selector-innards"
+				}
+			]
+		},
+		"selector-innards": {
+			"patterns": [
+				{
+					"include": "#comment-block"
+				},
+				{
+					"include": "#commas"
+				},
+				{
+					"include": "#escapes"
+				},
+				{
+					"include": "#combinators"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "entity.other.namespace-prefix.css"
+						},
+						"2": {
+							"name": "punctuation.separator.css"
+						}
+					},
+					"match": "(?x)\n(?:^|(?<=[\\s,(};]))         # Follows whitespace, comma, semicolon, or bracket\n(?!\n  [-\\w*]+\n  \\|\n  (?!\n      [-\\[:.*\\#a-zA-Z_]    # Make sure there's a selector to match\n    | [^\\x00-\\x7F]\n  )\n)\n(\n  (?: [-a-zA-Z_]    | [^\\x00-\\x7F] )   # First letter\n  (?: [-a-zA-Z0-9_] | [^\\x00-\\x7F]     # Remainder of identifier\n    | \\\\(?:[0-9a-fA-F]{1,6}|.)\n  )*\n  |\n  \\*     # Universal namespace\n)?\n(\\|)     # Namespace separator"
+				},
+				{
+					"include": "#tag-names"
+				},
+				{
+					"match": "\\*",
+					"name": "entity.name.tag.wildcard.css"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#escapes"
+								}
+							]
+						}
+					},
+					"match": "(?x) (?<![@\\w-])\n([.\\#])\n# Invalid identifier\n(\n  (?:\n    # Starts with ASCII digits, with possible hyphen preceding it\n    -?[0-9]\n    |\n    # Consists of a hyphen only\n    -                                      # Terminated by either:\n    (?= $                                  # - End-of-line\n      | [\\s,.\\#)\\[:{>+~|]               # - Followed by another selector\n      | /\\*                               # - Followed by a block comment\n    )\n    |\n    # Name contains unescaped ASCII symbol\n    (?:                                    # Check for acceptable preceding characters\n        [-a-zA-Z_0-9]|[^\\x00-\\x7F]       # - Valid selector character\n      | \\\\(?:[0-9a-fA-F]{1,6}|.)         # - Escape sequence\n    )*\n    (?:                                    # Invalid punctuation\n      [!\"'%&(*;<?@^`|\\]}]                 # - NOTE: We exempt `)` from the list of checked\n      |                                    #   symbols to avoid matching `:not(.invalid)`\n      / (?!\\*)                            # - Avoid invalidating the start of a comment\n    )+\n  )\n  # Mark remainder of selector invalid\n  (?: [-a-zA-Z_0-9]|[^\\x00-\\x7F]         # - Otherwise valid identifier characters\n    | \\\\(?:[0-9a-fA-F]{1,6}|.)           # - Escape sequence\n  )*\n)",
+					"name": "invalid.illegal.bad-identifier.css"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#escapes"
+								}
+							]
+						}
+					},
+					"match": "(?x)\n(\\.)                                  # Valid class-name\n(\n  (?: [-a-zA-Z_0-9]|[^\\x00-\\x7F]     # Valid identifier characters\n    | \\\\(?:[0-9a-fA-F]{1,6}|.)       # Escape sequence\n  )+\n)                                      # Followed by either:\n(?= $                                  # - End of the line\n  | [\\s,.\\#)\\[:{>+~|]               # - Another selector\n  | /\\*                               # - A block comment\n)",
+					"name": "entity.other.attribute-name.class.css"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.css"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#escapes"
+								}
+							]
+						}
+					},
+					"match": "(?x)\n(\\#)\n(\n  -?\n  (?![0-9])\n  (?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+\n)\n(?=$|[\\s,.\\#)\\[:{>+~|]|/\\*)",
+					"name": "entity.other.attribute-name.id.css"
+				},
+				{
+					"begin": "\\[",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.entity.begin.bracket.square.css"
+						}
+					},
+					"end": "\\]",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.entity.end.bracket.square.css"
+						}
+					},
+					"name": "meta.attribute-selector.css",
+					"patterns": [
+						{
+							"include": "#comment-block"
+						},
+						{
+							"include": "#string"
+						},
+						{
+							"captures": {
+								"1": {
+									"name": "storage.modifier.ignore-case.css"
+								}
+							},
+							"match": "(?<=[\"'\\s]|^|\\*/)\\s*([iI])\\s*(?=[\\s\\]]|/\\*|$)"
+						},
+						{
+							"captures": {
+								"1": {
+									"name": "string.unquoted.attribute-value.css",
+									"patterns": [
+										{
+											"include": "#escapes"
+										}
+									]
+								}
+							},
+							"match": "(?x)(?<==)\\s*((?!/\\*)(?:[^\\\\\"'\\s\\]]|\\\\.)+)"
+						},
+						{
+							"include": "#escapes"
+						},
+						{
+							"match": "[~|^$*]?=",
+							"name": "keyword.operator.pattern.css"
+						},
+						{
+							"match": "\\|",
+							"name": "punctuation.separator.css"
+						},
+						{
+							"captures": {
+								"1": {
+									"name": "entity.other.namespace-prefix.css",
+									"patterns": [
+										{
+											"include": "#escapes"
+										}
+									]
+								}
+							},
+							"match": "(?x)\n# Qualified namespace prefix\n( -?(?!\\d)(?:[\\w-]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+\n| \\*\n)\n# Lookahead to ensure there's a valid identifier ahead\n(?=\n  \\| (?!\\s|=|$|\\])\n  (?: -?(?!\\d)\n   |   [\\\\\\w-]\n   |   [^\\x00-\\x7F]\n   )\n)"
+						},
+						{
+							"captures": {
+								"1": {
+									"name": "entity.other.attribute-name.css",
+									"patterns": [
+										{
+											"include": "#escapes"
+										}
+									]
+								}
+							},
+							"match": "(?x)\n(-?(?!\\d)(?>[\\w-]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+)\n\\s*\n(?=[~|^\\]$*=]|/\\*)"
+						}
+					]
+				},
+				{
+					"include": "#pseudo-classes"
+				},
+				{
+					"include": "#pseudo-elements"
+				},
+				{
+					"include": "#functional-pseudo-classes"
+				},
+				{
+					"match": "(?x) (?<![@\\w-])\n(?=            # Custom element names must:\n  [a-z]        # - start with a lowercase ASCII letter,\n  \\w* -       # - contain at least one dash\n)\n(?:\n  (?![A-Z])    # No uppercase ASCII letters are allowed\n  [\\w-]       # Allow any other word character or dash\n)+\n(?![(\\w-])",
+					"name": "entity.name.tag.custom.css"
+				}
+			]
+		},
+		"string": {
+			"patterns": [
+				{
+					"begin": "\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.css"
+						}
+					},
+					"end": "\"|(?<!\\\\)(?=$|\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.css"
+						}
+					},
+					"name": "string.quoted.double.css",
+					"patterns": [
+						{
+							"begin": "(?:\\G|^)(?=(?:[^\\\\\"]|\\\\.)+$)",
+							"end": "$",
+							"name": "invalid.illegal.unclosed.string.css",
+							"patterns": [
+								{
+									"include": "#escapes"
+								}
+							]
+						},
+						{
+							"include": "#escapes"
+						}
+					]
+				},
+				{
+					"begin": "'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.css"
+						}
+					},
+					"end": "'|(?<!\\\\)(?=$|\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.css"
+						}
+					},
+					"name": "string.quoted.single.css",
+					"patterns": [
+						{
+							"begin": "(?:\\G|^)(?=(?:[^\\\\']|\\\\.)+$)",
+							"end": "$",
+							"name": "invalid.illegal.unclosed.string.css",
+							"patterns": [
+								{
+									"include": "#escapes"
+								}
+							]
+						},
+						{
+							"include": "#escapes"
+						}
+					]
+				}
+			]
+		},
+		"tag-names": {
+			"match": "(?xi) (?<![\\w:-])\n(?:\n    # HTML\n    a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdi|bdo|bgsound\n  | big|blink|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command\n  | content|data|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|element|em|embed|fieldset\n  | figcaption|figure|font|footer|form|frame|frameset|h[1-6]|head|header|hgroup|hr|html|i\n  | iframe|image|img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|main|map|mark\n  | marquee|math|menu|menuitem|meta|meter|multicol|nav|nextid|nobr|noembed|noframes|noscript\n  | object|ol|optgroup|option|output|p|param|picture|plaintext|pre|progress|q|rb|rp|rt|rtc\n  | ruby|s|samp|script|section|select|shadow|slot|small|source|spacer|span|strike|strong\n  | style|sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr\n  | track|tt|u|ul|var|video|wbr|xmp\n\n  # SVG\n  | altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform\n  | circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix\n  | feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap\n  | feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur\n  | feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting\n  | feSpotLight|feTile|feTurbulence|filter|font-face|font-face-format|font-face-name\n  | font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern\n  | line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata\n  | missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor\n  | stop|svg|switch|symbol|text|textPath|tref|tspan|use|view|vkern\n\n  # MathML\n  | annotation|annotation-xml|maction|maligngroup|malignmark|math|menclose|merror|mfenced\n  | mfrac|mglyph|mi|mlabeledtr|mlongdiv|mmultiscripts|mn|mo|mover|mpadded|mphantom|mroot\n  | mrow|ms|mscarries|mscarry|msgroup|msline|mspace|msqrt|msrow|mstack|mstyle|msub|msubsup\n  | msup|mtable|mtd|mtext|mtr|munder|munderover|semantics\n)\n(?=[+~>\\s,.\\#|){:\\[]|/\\*|$)",
+			"name": "entity.name.tag.css"
+		},
+		"unicode-range": {
+			"captures": {
+				"0": {
+					"name": "constant.other.unicode-range.css"
+				},
+				"1": {
+					"name": "punctuation.separator.dash.unicode-range.css"
+				}
+			},
+			"match": "(?<![\\w-])[Uu]\\+[0-9A-Fa-f?]{1,6}(?:(-)[0-9A-Fa-f]{1,6})?(?![\\w-])"
+		},
+		"url": {
+			"begin": "(?i)(?<![\\w@-])(url)(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.url.css"
+				},
+				"2": {
+					"name": "punctuation.section.function.begin.bracket.round.css"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.function.end.bracket.round.css"
+				}
+			},
+			"name": "meta.function.url.css",
+			"patterns": [
+				{
+					"match": "[^'\")\\s]+",
+					"name": "variable.parameter.url.css"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#comment-block"
+				},
+				{
+					"include": "#escapes"
+				}
+			]
+		}
+	}
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json
new file mode 100644
index 000000000..ef850d941
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json
@@ -0,0 +1,2643 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/textmate/html.tmbundle/blob/master/Syntaxes/HTML.plist",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/textmate/html.tmbundle/commit/0c3d5ee54de3a993f747f54186b73a4d2d3c44a2",
+	"name": "HTML",
+	"scopeName": "text.html.basic",
+	"injections": {
+		"R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
+			"comment": "Uses R: to ensure this matches after any other injections.",
+			"patterns": [
+				{
+					"match": "<",
+					"name": "invalid.illegal.bad-angle-bracket.html"
+				}
+			]
+		}
+	},
+	"patterns": [
+		{
+			"include": "#xml-processing"
+		},
+		{
+			"include": "#comment"
+		},
+		{
+			"include": "#doctype"
+		},
+		{
+			"include": "#cdata"
+		},
+		{
+			"include": "#tags-valid"
+		},
+		{
+			"include": "#tags-invalid"
+		},
+		{
+			"include": "#entities"
+		}
+	],
+	"repository": {
+		"attribute": {
+			"patterns": [
+				{
+					"begin": "(s(hape|cope|t(ep|art)|ize(s)?|p(ellcheck|an)|elected|lot|andbox|rc(set|doc|lang)?)|h(ttp-equiv|i(dden|gh)|e(ight|aders)|ref(lang)?)|n(o(nce|validate|module)|ame)|c(h(ecked|arset)|ite|o(nt(ent(editable)?|rols)|ords|l(s(pan)?|or))|lass|rossorigin)|t(ype(mustmatch)?|itle|a(rget|bindex)|ranslate)|i(s(map)?|n(tegrity|putmode)|tem(scope|type|id|prop|ref)|d)|op(timum|en)|d(i(sabled|r(name)?)|ownload|e(coding|f(er|ault))|at(etime|a)|raggable)|usemap|p(ing|oster|la(ysinline|ceholder)|attern|reload)|enctype|value|kind|for(m(novalidate|target|enctype|action|method)?)?|w(idth|rap)|l(ist|o(op|w)|a(ng|bel))|a(s(ync)?|c(ce(sskey|pt(-charset)?)|tion)|uto(c(omplete|apitalize)|play|focus)|l(t|low(usermedia|paymentrequest|fullscreen))|bbr)|r(ows(pan)?|e(versed|quired|ferrerpolicy|l|adonly))|m(in(length)?|u(ted|ltiple)|e(thod|dia)|a(nifest|x(length)?)))(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 attributes, not event handlers",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"begin": "style(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 style attribute",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.style.html",
+					"patterns": [
+						{
+							"begin": "=",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.separator.key-value.html"
+								}
+							},
+							"end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
+							"patterns": [
+								{
+									"begin": "(?=[^\\s=<>`/]|/(?!>))",
+									"end": "(?!\\G)",
+									"name": "meta.embedded.line.css",
+									"patterns": [
+										{
+											"captures": {
+												"0": {
+													"name": "source.css"
+												}
+											},
+											"match": "([^\\s\"'=<>`/]|/(?!>))+",
+											"name": "string.unquoted.html"
+										},
+										{
+											"begin": "\"",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.css",
+											"end": "(\")",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.css"
+												}
+											},
+											"name": "string.quoted.double.html",
+											"patterns": [
+												{
+													"include": "#entities"
+												}
+											]
+										},
+										{
+											"begin": "'",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.css",
+											"end": "(')",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.css"
+												}
+											},
+											"name": "string.quoted.single.html",
+											"patterns": [
+												{
+													"include": "#entities"
+												}
+											]
+										}
+									]
+								},
+								{
+									"match": "=",
+									"name": "invalid.illegal.unexpected-equals-sign.html"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "on(s(croll|t(orage|alled)|u(spend|bmit)|e(curitypolicyviolation|ek(ing|ed)|lect))|hashchange|c(hange|o(ntextmenu|py)|u(t|echange)|l(ick|ose)|an(cel|play(through)?))|t(imeupdate|oggle)|in(put|valid)|o(nline|ffline)|d(urationchange|r(op|ag(start|over|e(n(ter|d)|xit)|leave)?)|blclick)|un(handledrejection|load)|p(opstate|lay(ing)?|a(ste|use|ge(show|hide))|rogress)|e(nded|rror|mptied)|volumechange|key(down|up|press)|focus|w(heel|aiting)|l(oad(start|e(nd|d(data|metadata)))?|anguagechange)|a(uxclick|fterprint|bort)|r(e(s(ize|et)|jectionhandled)|atechange)|m(ouse(o(ut|ver)|down|up|enter|leave|move)|essage(error)?)|b(efore(unload|print)|lur))(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 attributes, event handlers",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.event-handler.$1.html",
+					"patterns": [
+						{
+							"begin": "=",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.separator.key-value.html"
+								}
+							},
+							"end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
+							"patterns": [
+								{
+									"begin": "(?=[^\\s=<>`/]|/(?!>))",
+									"end": "(?!\\G)",
+									"name": "meta.embedded.line.js",
+									"patterns": [
+										{
+											"captures": {
+												"0": {
+													"name": "source.js"
+												},
+												"1": {
+													"patterns": [
+														{
+															"include": "source.js"
+														}
+													]
+												}
+											},
+											"match": "(([^\\s\"'=<>`/]|/(?!>))+)",
+											"name": "string.unquoted.html"
+										},
+										{
+											"begin": "\"",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.js",
+											"end": "(\")",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.js"
+												}
+											},
+											"name": "string.quoted.double.html",
+											"patterns": [
+												{
+													"captures": {
+														"0": {
+															"patterns": [
+																{
+																	"include": "source.js"
+																}
+															]
+														}
+													},
+													"match": "([^\\n\"/]|/(?![/*]))+"
+												},
+												{
+													"begin": "//",
+													"beginCaptures": {
+														"0": {
+															"name": "punctuation.definition.comment.js"
+														}
+													},
+													"end": "(?=\")|\\n",
+													"name": "comment.line.double-slash.js"
+												},
+												{
+													"begin": "/\\*",
+													"beginCaptures": {
+														"0": {
+															"name": "punctuation.definition.comment.begin.js"
+														}
+													},
+													"end": "(?=\")|\\*/",
+													"endCaptures": {
+														"0": {
+															"name": "punctuation.definition.comment.end.js"
+														}
+													},
+													"name": "comment.block.js"
+												}
+											]
+										},
+										{
+											"begin": "'",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.js",
+											"end": "(')",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.js"
+												}
+											},
+											"name": "string.quoted.single.html",
+											"patterns": [
+												{
+													"captures": {
+														"0": {
+															"patterns": [
+																{
+																	"include": "source.js"
+																}
+															]
+														}
+													},
+													"match": "([^\\n'/]|/(?![/*]))+"
+												},
+												{
+													"begin": "//",
+													"beginCaptures": {
+														"0": {
+															"name": "punctuation.definition.comment.js"
+														}
+													},
+													"end": "(?=')|\\n",
+													"name": "comment.line.double-slash.js"
+												},
+												{
+													"begin": "/\\*",
+													"beginCaptures": {
+														"0": {
+															"name": "punctuation.definition.comment.begin.js"
+														}
+													},
+													"end": "(?=')|\\*/",
+													"endCaptures": {
+														"0": {
+															"name": "punctuation.definition.comment.end.js"
+														}
+													},
+													"name": "comment.block.js"
+												}
+											]
+										}
+									]
+								},
+								{
+									"match": "=",
+									"name": "invalid.illegal.unexpected-equals-sign.html"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(data-[a-z\\-]+)(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 attributes, data-*",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.data-x.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"begin": "(align|bgcolor|border)(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "invalid.deprecated.entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML attributes, deprecated",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "Anything else that is valid",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.unrecognized.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"match": "[^\\s>]+",
+					"name": "invalid.illegal.character-not-allowed-here.html"
+				}
+			]
+		},
+		"attribute-interior": {
+			"patterns": [
+				{
+					"begin": "=",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.key-value.html"
+						}
+					},
+					"end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
+					"patterns": [
+						{
+							"match": "([^\\s\"'=<>`/]|/(?!>))+",
+							"name": "string.unquoted.html"
+						},
+						{
+							"begin": "\"",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.html"
+								}
+							},
+							"end": "\"",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.html"
+								}
+							},
+							"name": "string.quoted.double.html",
+							"patterns": [
+								{
+									"include": "#entities"
+								}
+							]
+						},
+						{
+							"begin": "'",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.html"
+								}
+							},
+							"end": "'",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.html"
+								}
+							},
+							"name": "string.quoted.single.html",
+							"patterns": [
+								{
+									"include": "#entities"
+								}
+							]
+						},
+						{
+							"match": "=",
+							"name": "invalid.illegal.unexpected-equals-sign.html"
+						}
+					]
+				}
+			]
+		},
+		"cdata": {
+			"begin": "<!\\[CDATA\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.begin.html"
+				}
+			},
+			"contentName": "string.other.inline-data.html",
+			"end": "]]>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.end.html"
+				}
+			},
+			"name": "meta.tag.metadata.cdata.html"
+		},
+		"comment": {
+			"begin": "<!--",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.html"
+				}
+			},
+			"end": "-->",
+			"name": "comment.block.html",
+			"patterns": [
+				{
+					"match": "\\G-?>",
+					"name": "invalid.illegal.characters-not-allowed-here.html"
+				},
+				{
+					"match": "<!--(?!>)|<!-(?=-->)",
+					"name": "invalid.illegal.characters-not-allowed-here.html"
+				},
+				{
+					"match": "--!>",
+					"name": "invalid.illegal.characters-not-allowed-here.html"
+				}
+			]
+		},
+		"core-minus-invalid": {
+			"comment": "This should be the root pattern array includes minus #tags-invalid",
+			"patterns": [
+				{
+					"include": "#xml-processing"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#doctype"
+				},
+				{
+					"include": "#cdata"
+				},
+				{
+					"include": "#tags-valid"
+				},
+				{
+					"include": "#entities"
+				}
+			]
+		},
+		"doctype": {
+			"begin": "<!(?=(?i:DOCTYPE\\s))",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.begin.html"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.end.html"
+				}
+			},
+			"name": "meta.tag.metadata.doctype.html",
+			"patterns": [
+				{
+					"match": "\\G(?i:DOCTYPE)",
+					"name": "entity.name.tag.html"
+				},
+				{
+					"begin": "\"",
+					"end": "\"",
+					"name": "string.quoted.double.html"
+				},
+				{
+					"match": "[^\\s>]+",
+					"name": "entity.other.attribute-name.html"
+				}
+			]
+		},
+		"entities": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.html"
+						},
+						"912": {
+							"name": "punctuation.definition.entity.html"
+						}
+					},
+					"comment": "Yes this is a bit ridiculous, there are quite a lot of these",
+					"match": "(?x)\n\t\t\t\t\t\t(&)\t(?=[a-zA-Z])\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(a(s(ymp(eq)?|cr|t)|n(d(slope|d|v|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a(h|c|d|e|f|a|g|b))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|e|E|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))\n\t\t\t\t\t\t  | (B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h(d|u|D|U)?|times|H(d|u|D|U)?|d(R|l|r|L)|u(R|l|r|L)|plus|D(R|l|r|L)|v(R|h|H|l|r|L)?|U(R|l|r|L)|V(R|h|H|l|r|L)?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1(2|4)|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))\n\t\t\t\t\t\t  | (c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr(l|r)|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))\n\t\t\t\t\t\t  | (d(s(c(y|r)|trok|ol)|har(l|r)|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))\n\t\t\t\t\t\t  | (e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t(h|a)|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1(3|4))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))\n\t\t\t\t\t\t  | (f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1(2|8|3|4|5|6)|78|2(3|5)|3(8|4|5)|45|5(8|6)))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))\n\t\t\t\t\t\t  | (G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im(e|l)?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l(j|E|a)?|a(cute|p|mma(d)?)|rave|g(g)?|breve))\n\t\t\t\t\t\t  | (h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))\n\t\t\t\t\t\t  | (i(s(cr|in(s(v)?|dot|v|E)?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f(f|r)|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))\n\t\t\t\t\t\t  | (j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))\n\t\t\t\t\t\t  | (k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))\n\t\t\t\t\t\t  | (l(s(h|cr|trok|im(e|g)?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i(e|f)?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))\n\t\t\t\t\t\t  | (M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))\n\t\t\t\t\t\t  | (n(s(hort(parallel|mid)|c(cue|e|r)?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|e|E)?|b(set(eq(q)?)?|e|E)?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v(c|a|b))?|in(dot|v(c|a|b)|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g(t|e))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr(c|w)?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))\n\t\t\t\t\t\t  | (o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|f|m)?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))\n\t\t\t\t\t\t  | (p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d(o|u)|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))\n\t\t\t\t\t\t  | (q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))\n\t\t\t\t\t\t  | (R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri(e|f|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng(d|e|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr)))\n\t\t\t\t\t\t  | (s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma(v|f)?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot(e|b)?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n(e|E)|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|n(e|E)|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar(e|f))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))\n\t\t\t\t\t\t  | (t(s(hcy|c(y|r)|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a(u|b)|ripleDot))\n\t\t\t\t\t\t  | (u(scr|h(ar(l|r)|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))\n\t\t\t\t\t\t  | (v(s(cr|u(pn(e|E)|bn(e|E)))|nsu(p|b)|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))\n\t\t\t\t\t\t  | (w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))\n\t\t\t\t\t\t  | (X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))\n\t\t\t\t\t\t  | (y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))\n\t\t\t\t\t\t  | (z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute))\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(;)\n\t\t\t\t\t",
+					"name": "constant.character.entity.named.$2.html"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.html"
+						},
+						"3": {
+							"name": "punctuation.definition.entity.html"
+						}
+					},
+					"match": "(&)#[0-9]+(;)",
+					"name": "constant.character.entity.numeric.decimal.html"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.html"
+						},
+						"3": {
+							"name": "punctuation.definition.entity.html"
+						}
+					},
+					"match": "(&)#[xX][0-9a-fA-F]+(;)",
+					"name": "constant.character.entity.numeric.hexadecimal.html"
+				},
+				{
+					"match": "&(?=[a-zA-Z0-9]+;)",
+					"name": "invalid.illegal.ambiguous-ampersand.html"
+				}
+			]
+		},
+		"math": {
+			"patterns": [
+				{
+					"begin": "(?i)(<)(math)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.start.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						"5": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"end": "(?i)(</)(\\2)\\s*(>)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.end.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.element.structure.$2.html",
+					"patterns": [
+						{
+							"begin": "(?<!>)\\G",
+							"end": ">",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.tag.structure.start.html",
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						{
+							"include": "#tags"
+						}
+					]
+				}
+			],
+			"repository": {
+				"attribute": {
+					"patterns": [
+						{
+							"begin": "(s(hift|ymmetric|cript(sizemultiplier|level|minsize)|t(ackalign|retchy)|ide|u(pscriptshift|bscriptshift)|e(parator(s)?|lection)|rc)|h(eight|ref)|n(otation|umalign)|c(haralign|olumn(spa(n|cing)|width|lines|align)|lose|rossout)|i(n(dent(shift(first|last)?|target|align(first|last)?)|fixlinebreakstyle)|d)|o(pen|verflow)|d(i(splay(style)?|r)|e(nomalign|cimalpoint|pth))|position|e(dge|qual(columns|rows))|voffset|f(orm|ence|rame(spacing)?)|width|l(space|ine(thickness|leading|break(style|multchar)?)|o(ngdivstyle|cation)|ength|quote|argeop)|a(c(cent(under)?|tiontype)|l(t(text|img(-(height|valign|width))?)|ign(mentscope)?))|r(space|ow(spa(n|cing)|lines|align)|quote)|groupalign|x(link:href|mlns)|m(in(size|labelspacing)|ovablelimits|a(th(size|color|variant|background)|xsize))|bevelled)(?![\\w:-])",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"comment": "Anything else that is valid",
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.unrecognized.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"match": "[^\\s>]+",
+							"name": "invalid.illegal.character-not-allowed-here.html"
+						}
+					]
+				},
+				"tags": {
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#cdata"
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.structure.math.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.structure.math.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.structure.math.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.structure.math.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.structure.math.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.structure.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.inline.math.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.inline.math.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.inline.math.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.inline.math.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.inline.math.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.inline.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.object.math.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.object.math.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.object.math.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.object.math.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.object.math.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.object.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.other.invalid.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.other.invalid.html"
+						},
+						{
+							"begin": "(?i)(<)((\\w[^\\s>]*))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.other.invalid.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.other.invalid.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"include": "#tags-invalid"
+						}
+					]
+				}
+			}
+		},
+		"svg": {
+			"patterns": [
+				{
+					"begin": "(?i)(<)(svg)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.start.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						"5": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"end": "(?i)(</)(\\2)\\s*(>)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.end.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.element.structure.$2.html",
+					"patterns": [
+						{
+							"begin": "(?<!>)\\G",
+							"end": ">",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.tag.structure.start.html",
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						{
+							"include": "#tags"
+						}
+					]
+				}
+			],
+			"repository": {
+				"attribute": {
+					"patterns": [
+						{
+							"begin": "(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em(h|v)|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y(1|2|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget(X|Y)?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At(X|Y|Z))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-(y|x)|adv-y)))|alues)|k(1|2|3|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f(X|Y|errerPolicy)|l)|adius|x)?|g(1|2|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x(1|2|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\\w:-])",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"comment": "Anything else that is valid",
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.unrecognized.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"match": "[^\\s>]+",
+							"name": "invalid.illegal.character-not-allowed-here.html"
+						}
+					]
+				},
+				"tags": {
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#cdata"
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.metadata.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.metadata.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.svg.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.metadata.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.metadata.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.structure.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.structure.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.structure.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.structure.svg.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.structure.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.structure.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.inline.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.inline.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.inline.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.inline.svg.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.inline.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.inline.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.object.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.object.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(a|circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.object.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.object.svg.$2.end.html"
+								},
+								"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"
+								}
+							},
+							"name": "meta.element.object.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.object.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.other.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.deprecated.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.other.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.other.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.deprecated.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.other.svg.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.deprecated.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.other.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.other.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.other.invalid.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.other.invalid.html"
+						},
+						{
+							"begin": "(?i)(<)((\\w[^\\s>]*))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.other.invalid.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.other.invalid.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"include": "#tags-invalid"
+						}
+					]
+				}
+			}
+		},
+		"tags-invalid": {
+			"patterns": [
+				{
+					"begin": "(</?)((\\w[^\\s>]*))(?<!/)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.illegal.unrecognized-tag.html"
+						}
+					},
+					"end": "((?: ?/)?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.other.$2.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				}
+			]
+		},
+		"tags-valid": {
+			"patterns": [
+				{
+					"begin": "(^[ \\t]+)?(?=<(?i:style)\\b(?!-))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.leading.html"
+						}
+					},
+					"end": "(?!\\G)([ \\t]*$\\n?)?",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.trailing.html"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "(?i)(<)(style)(?=\\s|/?>)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.style.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								}
+							},
+							"end": "(?i)((<)/)(style)\\s*(>)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.style.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "source.css-ignored-vscode"
+								},
+								"3": {
+									"name": "entity.name.tag.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.embedded.block.html",
+							"patterns": [
+								{
+									"begin": "\\G",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"end": "(>)",
+									"name": "meta.tag.metadata.style.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"begin": "(?!\\G)",
+									"end": "(?=</(?i:style))",
+									"name": "source.css",
+									"patterns": [
+										{
+											"include": "source.css"
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(^[ \\t]+)?(?=<(?i:script)\\b(?!-))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.leading.html"
+						}
+					},
+					"end": "(?!\\G)([ \\t]*$\\n?)?",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.trailing.html"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "(<)((?i:script))\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.script.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								}
+							},
+							"end": "(/)((?i:script))(>)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.script.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.embedded.block.html",
+							"patterns": [
+								{
+									"begin": "\\G",
+									"end": "(?=/)",
+									"patterns": [
+										{
+											"begin": "(>)",
+											"beginCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.start.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.end.html"
+												}
+											},
+											"end": "((<))(?=/(?i:script))",
+											"endCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.end.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.begin.html"
+												},
+												"2": {
+													"name": "source.js-ignored-vscode"
+												}
+											},
+											"patterns": [
+												{
+													"begin": "\\G",
+													"end": "(?=</(?i:script))",
+													"name": "source.js",
+													"patterns": [
+														{
+															"begin": "(^[ \\t]+)?(?=//)",
+															"beginCaptures": {
+																"1": {
+																	"name": "punctuation.whitespace.comment.leading.js"
+																}
+															},
+															"end": "(?!\\G)",
+															"patterns": [
+																{
+																	"begin": "//",
+																	"beginCaptures": {
+																		"0": {
+																			"name": "punctuation.definition.comment.js"
+																		}
+																	},
+																	"end": "(?=</script)|\\n",
+																	"name": "comment.line.double-slash.js"
+																}
+															]
+														},
+														{
+															"begin": "/\\*",
+															"captures": {
+																"0": {
+																	"name": "punctuation.definition.comment.js"
+																}
+															},
+															"end": "\\*/|(?=</script)",
+															"name": "comment.block.js"
+														},
+														{
+															"include": "source.js"
+														}
+													]
+												}
+											]
+										},
+										{
+											"begin": "\\G",
+											"end": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=>\t\t\t\t\t\t\t\t\t\t\t# Tag without type attribute\n\t\t\t\t\t\t\t\t\t\t\t\t  | type(?=[\\s=])\n\t\t\t\t\t\t\t\t\t\t\t\t  \t(?!\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t''\t\t\t\t\t\t\t\t# Empty\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | \"\"\t\t\t\t\t\t\t\t\t#   Values\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | ('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\t\t\t\t\t\t\t# Text mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tjavascript(1\\.[0-5])?\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | x-javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | jscript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | livescript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | babel\t\t\t\t\t\t# Javascript variant currently\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t\t\t\t\t\t\t\t#   recognized as such\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | application/\t\t\t\t\t# Application mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(x-)?javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | module\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+											"name": "meta.tag.metadata.script.start.html",
+											"patterns": [
+												{
+													"include": "#attribute"
+												}
+											]
+										},
+										{
+											"begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+											"end": "((<))(?=/(?i:script))",
+											"endCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.end.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.begin.html"
+												},
+												"2": {
+													"name": "text.html.basic"
+												}
+											},
+											"patterns": [
+												{
+													"begin": "\\G",
+													"end": "(>)",
+													"endCaptures": {
+														"1": {
+															"name": "punctuation.definition.tag.end.html"
+														}
+													},
+													"name": "meta.tag.metadata.script.start.html",
+													"patterns": [
+														{
+															"include": "#attribute"
+														}
+													]
+												},
+												{
+													"begin": "(?!\\G)",
+													"end": "(?=</(?i:script))",
+													"name": "text.html.basic",
+													"patterns": [
+														{
+															"include": "text.html.basic"
+														}
+													]
+												}
+											]
+										},
+										{
+											"begin": "(?=(?i:type))",
+											"end": "(<)(?=/(?i:script))",
+											"endCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.end.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.begin.html"
+												}
+											},
+											"patterns": [
+												{
+													"begin": "\\G",
+													"end": "(>)",
+													"endCaptures": {
+														"1": {
+															"name": "punctuation.definition.tag.end.html"
+														}
+													},
+													"name": "meta.tag.metadata.script.start.html",
+													"patterns": [
+														{
+															"include": "#attribute"
+														}
+													]
+												},
+												{
+													"begin": "(?!\\G)",
+													"end": "(?=</(?i:script))",
+													"name": "source.unknown"
+												}
+											]
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(base|link|meta)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(noscript|title)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(noscript|title)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(col|hr|input)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(address|article|aside|blockquote|body|button|caption|colgroup|datalist|dd|details|dialog|div|dl|dt|fieldset|figcaption|figure|footer|form|head|header|hgroup|html|h[1-6]|label|legend|li|main|map|menu|meter|nav|ol|optgroup|option|output|p|pre|progress|section|select|slot|summary|table|tbody|td|template|textarea|tfoot|th|thead|tr|ul)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(address|article|aside|blockquote|body|button|caption|colgroup|datalist|dd|details|dialog|div|dl|dt|fieldset|figcaption|figure|footer|form|head|header|hgroup|html|h[1-6]|label|legend|li|main|map|menu|meter|nav|ol|optgroup|option|output|p|pre|progress|section|select|slot|summary|table|tbody|td|template|textarea|tfoot|th|thead|tr|ul)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(area|br|wbr)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(a|abbr|b|bdi|bdo|cite|code|data|del|dfn|em|i|ins|kbd|mark|q|rp|rt|ruby|s|samp|small|span|strong|sub|sup|time|u|var)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(a|abbr|b|bdi|bdo|cite|code|data|del|dfn|em|i|ins|kbd|mark|q|rp|rt|ruby|s|samp|small|span|strong|sub|sup|time|u|var)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(embed|img|param|source|track)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(audio|canvas|iframe|object|picture|video)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(audio|canvas|iframe|object|picture|video)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((basefont|isindex))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((center|frameset|noembed|noframes))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((center|frameset|noembed|noframes))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((acronym|big|blink|font|strike|tt|xmp))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((acronym|big|blink|font|strike|tt|xmp))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((frame))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((applet))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((applet))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((dir|keygen|listing|menuitem|plaintext|spacer))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.illegal.no-longer-supported.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.other.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((dir|keygen|listing|menuitem|plaintext|spacer))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.illegal.no-longer-supported.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.other.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"include": "#math"
+				},
+				{
+					"include": "#svg"
+				},
+				{
+					"begin": "(<)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.custom.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(</)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.custom.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				}
+			]
+		},
+		"xml-processing": {
+			"begin": "(<\\?)(xml)",
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.tag.html"
+				},
+				"2": {
+					"name": "entity.name.tag.html"
+				}
+			},
+			"end": "(\\?>)",
+			"name": "meta.tag.metadata.processing.xml.html",
+			"patterns": [
+				{
+					"include": "#attribute"
+				}
+			]
+		}
+	}
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/__snapshots__/grammarTests.test.ts.snap b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/__snapshots__/grammarTests.test.ts.snap
new file mode 100644
index 000000000..88b77e4ce
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/__snapshots__/grammarTests.test.ts.snap
@@ -0,0 +1,8413 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Grammar tests @addTagHelper directive Incomplete parameter 1`] = `
+"Line: @addTagHelper "
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 13 (addTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.addTagHelper
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+"
+`;
+
+exports[`Grammar tests @addTagHelper directive No parameter 1`] = `
+"Line: @addTagHelper
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 13 (addTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.addTagHelper
+"
+`;
+
+exports[`Grammar tests @addTagHelper directive No parameter, spaced 1`] = `
+"Line: @addTagHelper                 
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 13 (addTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.addTagHelper
+ - token from 13 to 31 (                 ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @addTagHelper directive Quoted parameter 1`] = `
+"Line: @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 13 (addTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.addTagHelper
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 53 (*, Microsoft.AspNetCore.Mvc.TagHelpers) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 53 to 54 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+"
+`;
+
+exports[`Grammar tests @addTagHelper directive Quoted parameter spaced 1`] = `
+"Line: @addTagHelper       "*     ,      Microsoft.AspNetCore.Mvc.TagHelpers   "            
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 13 (addTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.addTagHelper
+ - token from 13 to 20 (       ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 20 to 21 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 21 to 72 (*     ,      Microsoft.AspNetCore.Mvc.TagHelpers   ) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 72 to 73 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 73 to 86 (            ) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+"
+`;
+
+exports[`Grammar tests @addTagHelper directive Unquoted parameter 1`] = `
+"Line: @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 13 (addTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.addTagHelper
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 53 (*, Microsoft.AspNetCore.Mvc.TagHelpers) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+"
+`;
+
+exports[`Grammar tests @attribute directive As C# local 1`] = `
+"Line: @attribute.method()
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 10 to 11 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 11 to 17 (method) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 18 to 19 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests @attribute directive Incomplete attribute, generic 1`] = `
+"Line: @attribute [CustomAttribute(info = typeof(GenericClass1<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.attribute
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 12 ([) with scopes text.aspnetcorerazor, meta.directive, punctuation.squarebracket.open.cs
+ - token from 12 to 27 (CustomAttribute) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 27 to 28 (() with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.open.cs
+ - token from 28 to 32 (info) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 33 to 34 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 35 to 41 (typeof) with scopes text.aspnetcorerazor, meta.directive, keyword.other.typeof.cs
+ - token from 41 to 42 (() with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.open.cs
+ - token from 42 to 55 (GenericClass1) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 55 to 56 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 56 to 62 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+"
+`;
+
+exports[`Grammar tests @attribute directive Incomplete attribute, simple 1`] = `
+"Line: @attribute [CustomAttribute
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.attribute
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 12 ([) with scopes text.aspnetcorerazor, meta.directive, punctuation.squarebracket.open.cs
+ - token from 12 to 27 (CustomAttribute) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @attribute directive Multi line, complex 1`] = `
+"Line: @attribute [
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.attribute
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 12 ([) with scopes text.aspnetcorerazor, meta.directive, punctuation.squarebracket.open.cs
+
+Line:     CustomAttribute(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 4 to 19 (CustomAttribute) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 19 to 20 (() with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.open.cs
+
+Line:         Info = typeof(GenericClass<string>),
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 12 (Info) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 13 to 14 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 15 to 21 (typeof) with scopes text.aspnetcorerazor, meta.directive, keyword.other.typeof.cs
+ - token from 21 to 22 (() with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.open.cs
+ - token from 22 to 34 (GenericClass) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 34 to 35 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 35 to 41 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+ - token from 41 to 42 (>) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.end.cs
+ - token from 42 to 43 ()) with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.close.cs
+ - token from 43 to 44 (,) with scopes text.aspnetcorerazor, meta.directive, punctuation.separator.comma.cs
+
+Line:         Foo = true
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 11 (Foo) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 12 to 13 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.directive, constant.language.boolean.true.cs
+
+Line:     )
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 4 to 5 ()) with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.close.cs
+
+Line: ]
+ - token from 0 to 1 (]) with scopes text.aspnetcorerazor, meta.directive, punctuation.squarebracket.close.cs
+"
+`;
+
+exports[`Grammar tests @attribute directive No attribute 1`] = `
+"Line: @attribute
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.attribute
+"
+`;
+
+exports[`Grammar tests @attribute directive No attribute spaced 1`] = `
+"Line: @attribute              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.attribute
+ - token from 10 to 25 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @attribute directive Single line, simple 1`] = `
+"Line: @attribute [Authorize]
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (attribute) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.attribute
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 12 ([) with scopes text.aspnetcorerazor, meta.directive, punctuation.squarebracket.open.cs
+ - token from 12 to 21 (Authorize) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 21 to 22 (]) with scopes text.aspnetcorerazor, meta.directive, punctuation.squarebracket.close.cs
+"
+`;
+
+exports[`Grammar tests @code directive Incomplete code block 1`] = `
+"Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+"
+`;
+
+exports[`Grammar tests @code directive Multi line 1`] = `
+"Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     private int currentCount = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 28 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.field.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 (0) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private void IncrementCount()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 31 (IncrementCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         var someString = "{ var ThisShouldNotBeCSharp = true; }";
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 22 (someString) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 26 to 63 ({ var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 63 to 64 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 64 to 65 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         currentCount++;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 20 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.increment.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Multi line no whitespace 1`] = `
+"Line: @code{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     private int currentCount = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 28 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.field.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 (0) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private void IncrementCount()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 31 (IncrementCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         var someString = "{ var ThisShouldNotBeCSharp = true; }";
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 22 (someString) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 26 to 63 ({ var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 63 to 64 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 64 to 65 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         currentCount++;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 20 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.increment.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Multi line then newline 1`] = `
+"Line: @code
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     private int currentCount = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 28 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.field.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 (0) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private void IncrementCount()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 31 (IncrementCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         var someString = "{ var ThisShouldNotBeCSharp = true; }";
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 22 (someString) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 26 to 63 ({ var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 63 to 64 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 64 to 65 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         currentCount++;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 20 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.increment.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Multi line with nullable property 1`] = `
+"Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     public string? Goo { get; set; }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 10 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 11 to 17 (string) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 17 to 18 (?) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.separator.question-mark.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 19 to 22 (Goo) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.property.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 28 (get) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.get.cs
+ - token from 28 to 29 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 29 to 30 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 30 to 33 (set) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.set.cs
+ - token from 33 to 34 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 35 to 36 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private int currentCount = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 28 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.field.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 (0) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private void IncrementCount()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 31 (IncrementCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         var someString = "{ var ThisShouldNotBeCSharp = true; }";
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 22 (someString) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 26 to 63 ({ var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 63 to 64 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 64 to 65 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         currentCount++;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 20 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.increment.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Multi line with property 1`] = `
+"Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     public string Goo { get; set; }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 10 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 11 to 17 (string) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 18 to 21 (Goo) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.property.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 22 to 23 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 24 to 27 (get) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.get.cs
+ - token from 27 to 28 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 32 (set) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.set.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 34 to 35 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private int currentCount = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 28 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.field.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 (0) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private void IncrementCount()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 31 (IncrementCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         var someString = "{ var ThisShouldNotBeCSharp = true; }";
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 22 (someString) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 26 to 63 ({ var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 63 to 64 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 64 to 65 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         currentCount++;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 20 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.increment.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Multi-line comment with curly braces 1`] = `
+"Line: @code { /* { var ThisShouldNotBeCSharp = true; } */ }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 10 (/*) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.block.cs, punctuation.definition.comment.cs
+ - token from 10 to 49 ( { var ThisShouldNotBeCSharp = true; } ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.block.cs
+ - token from 49 to 51 (*/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.block.cs, punctuation.definition.comment.cs
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 52 to 53 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive No code block 1`] = `
+"Line: @code
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+"
+`;
+
+exports[`Grammar tests @code directive Single line 1`] = `
+"Line: @code { public void Foo() {} }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 14 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 15 to 19 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 20 to 23 (Foo) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 23 to 24 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 24 to 25 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 26 to 27 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 27 to 28 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Single line no whitespace 1`] = `
+"Line: @code{ public void Foo() {} }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 7 to 13 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 14 to 18 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 19 to 22 (Foo) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 22 to 23 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 23 to 24 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 26 to 27 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+ - token from 27 to 28 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 28 to 29 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Single-line comment with curly braces 1`] = `
+"Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor
+
+Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     // { var ThisShouldNotBeCSharp = true; }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.whitespace.comment.leading.cs
+ - token from 4 to 6 (//) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.line.double-slash.cs, punctuation.definition.comment.cs
+ - token from 6 to 44 ( { var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.line.double-slash.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @code directive Variable starting with code 1`] = `
+"Line: @codeTest then words
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (codeTest) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 21 ( then words) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @code directive With Razor and markup 1`] = `
+"Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     private void SomeMethod()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 27 (SomeMethod) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 27 to 28 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 28 to 29 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         <p>This method <strong>is really</strong> nice!
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 11 to 15 (This) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 22 (method) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 24 to 30 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 30 to 31 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 31 to 33 (is) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.is.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 34 to 40 (really) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 42 to 48 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 49 to 50 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 50 to 54 (nice) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 54 to 55 (!) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.logical.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:             @if(true) {
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (@if) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 16 to 20 (true) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.language.boolean.true.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 22 to 23 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:                 <input type="checkbox" value="true" name="Something" />
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 17 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 17 to 22 (input) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 27 (type) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 27 to 28 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 28 to 29 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 29 to 37 (checkbox) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 37 to 38 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 38 to 39 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 39 to 44 (value) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 44 to 45 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 45 to 46 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 46 to 50 (true) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 50 to 51 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 52 to 56 (name) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 56 to 57 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 57 to 58 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 58 to 67 (Something) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 67 to 68 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 68 to 69 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 69 to 70 (/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 70 to 71 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+
+Line:             }
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 14 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:         </p>
+ - token from 0 to 10 (        </) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 10 to 11 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 11 to 13 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:         @DateTime.Now
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 17 (@DateTime) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 17 to 18 (.) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 18 to 21 (Now) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:         <input type="hidden" value=" { true }" name="Something">
+ - token from 0 to 9 (        <) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 9 to 14 (input) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 15 to 19 (type) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 19 to 20 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 20 to 21 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 21 to 27 (hidden) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 27 to 28 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 34 (value) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 34 to 35 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 35 to 36 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 36 to 45 ( { true }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 45 to 46 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 46 to 47 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 47 to 51 (name) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 51 to 52 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 52 to 53 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 53 to 62 (Something) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 62 to 63 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 63 to 64 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 6 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line: }
+ - token from 0 to 2 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Incomplete do statement, no body 1`] = `
+"Line: @do
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.loop.do.cs
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Incomplete do while statement, no condition 1`] = `
+"Line: @do { } while ;
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.loop.do.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 6 to 7 (}) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 7 to 16 ( while ;) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Incomplete do while statement, no terminator 1`] = `
+"Line: @do { } while
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.loop.do.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 6 to 7 (}) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 7 to 14 ( while) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Multi line body 1`] = `
+"Line: @do
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.loop.do.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @do {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 9 to 11 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, keyword.control.loop.do.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         } while(GetAnotherValue());
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 10 to 15 (while) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 31 (GetAnotherValue) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 34 to 35 (;) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.terminator.statement.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }while(true);
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 1 to 6 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 6 to 7 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 7 to 11 (true) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.true.cs
+ - token from 11 to 12 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 12 to 13 (;) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.terminator.statement.cs
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Multi line condition 1`] = `
+"Line: @do
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.loop.do.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: while (
+ - token from 0 to 5 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 6 to 7 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetATruthyValue(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 10 to 25 (GetATruthyValue) with scopes text.aspnetcorerazor, meta.statement.while.razor, entity.name.function.cs
+ - token from 25 to 26 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.comma.cs
+
+Line:         name: "Hello",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.while.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.while.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 20 (Hello) with scopes text.aspnetcorerazor, meta.statement.while.razor, string.quoted.double.cs
+ - token from 20 to 21 (") with scopes text.aspnetcorerazor, meta.statement.while.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 21 to 22 (,) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.curlybrace.close.cs
+
+Line: ));
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 (;) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.terminator.statement.cs
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     do {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor
+ - token from 4 to 6 (do) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, keyword.control.loop.do.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor
+ - token from 7 to 8 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     } while(GetAnotherValue());
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 6 to 11 (while) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 11 to 12 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 12 to 27 (GetAnotherValue) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, entity.name.function.cs
+ - token from 27 to 28 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 28 to 29 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 29 to 30 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 30 to 31 (;) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.terminator.statement.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     do not classify this
+ - token from 0 to 25 (    do not classify this) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @do { ... } while ( ... ); Single line 1`] = `
+"Line: @do { var x = 123;<p>Hello World</p> }while (   true  );
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (do) with scopes text.aspnetcorerazor, meta.statement.do.razor, keyword.control.loop.do.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 6 to 9 (var) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (x) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (=) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 14 to 17 (123) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 17 to 18 (;) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 18 to 19 (<) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 19 to 20 (p) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 21 to 32 (Hello World) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 34 (</) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 34 to 35 (p) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 36 to 37 ( ) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 37 to 38 (}) with scopes text.aspnetcorerazor, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 38 to 43 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 43 to 44 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 44 to 45 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 45 to 48 (   ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 48 to 52 (true) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.true.cs
+ - token from 52 to 54 (  ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 54 to 55 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 55 to 56 (;) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.terminator.statement.cs
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Incomplete for statement, no condition 1`] = `
+"Line: @for {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 4 (for) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 4 to 8 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Incomplete for statement, no condition or body 1`] = `
+"Line: @for
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 4 (for) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Multi line body 1`] = `
+"Line: @for (var i = 0; i < 10; i++)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (for) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 5 to 6 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 6 to 9 (var) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.other.var.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 10 to 11 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.variable.local.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 12 to 13 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 14 to 15 (0) with scopes text.aspnetcorerazor, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 17 to 18 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 19 to 20 (<) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.relational.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 21 to 23 (10) with scopes text.aspnetcorerazor, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 25 to 26 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 26 to 28 (++) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.increment.cs
+ - token from 28 to 29 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @for (i = i + 1; i < 10; i+= 2) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.control.cshtml.transition
+ - token from 9 to 12 (for) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 13 to 14 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 14 to 15 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 18 to 19 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 20 to 21 (+) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.arithmetic.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 22 to 23 (1) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 25 to 26 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 27 to 28 (<) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.relational.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 29 to 31 (10) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 31 to 32 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 33 to 34 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 34 to 36 (+=) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.assignment.compound.cs
+ - token from 36 to 37 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 37 to 38 (2) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 38 to 39 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 40 to 41 ({) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p>@i</p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 16 (@) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 16 to 17 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 17 to 19 (</) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 19 to 20 (p) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Multi line condition 1`] = `
+"Line: @for (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (for) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 5 to 6 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+
+Line:     var j = GetInitialValue(name: true);
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 8 to 9 (j) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 12 to 27 (GetInitialValue) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.function.cs
+ - token from 27 to 28 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 28 to 32 (name) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.variable.parameter.cs
+ - token from 32 to 33 (:) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.separator.colon.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 34 to 38 (true) with scopes text.aspnetcorerazor, meta.statement.for.razor, constant.language.boolean.true.cs
+ - token from 38 to 39 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 39 to 40 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.terminator.statement.cs
+
+Line:     j <= await GetMaxIncrementCount(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 4 to 5 (j) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 6 to 8 (<=) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.relational.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 9 to 14 (await) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.other.await.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 15 to 35 (GetMaxIncrementCount) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.function.cs
+ - token from 35 to 36 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.for.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.separator.comma.cs
+
+Line:         name: "The Good Value",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.for.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 29 (The Good Value) with scopes text.aspnetcorerazor, meta.statement.for.razor, string.quoted.double.cs
+ - token from 29 to 30 (") with scopes text.aspnetcorerazor, meta.statement.for.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 30 to 31 (,) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.for.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.separator.comma.cs
+
+Line:         });
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.curlybrace.close.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.terminator.statement.cs
+
+Line:     j++
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 4 to 5 (j) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 5 to 7 (++) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.increment.cs
+
+Line: ){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 2 to 3 (}) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     for (var i = 0; i < 10; i++) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 4 to 7 (for) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 12 (var) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.other.var.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 13 to 14 (i) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, entity.name.variable.local.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 15 to 16 (=) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 17 to 18 (0) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 18 to 19 (;) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 20 to 21 (i) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 22 to 23 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.relational.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 24 to 26 (10) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 26 to 27 (;) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 27 to 28 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 28 to 29 (i) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 29 to 31 (++) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, keyword.operator.increment.cs
+ - token from 31 to 32 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor
+ - token from 33 to 34 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     for (this) is the best classification
+ - token from 0 to 42 (    for (this) is the best classification) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @for ( ... ) { ... } Single line 1`] = `
+"Line: @for (var i = 0; i < GetCount(); i++)) { var x = 123;<p>Hello World @i</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (for) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 5 to 6 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 6 to 9 (var) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.other.var.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 10 to 11 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.variable.local.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 12 to 13 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 14 to 15 (0) with scopes text.aspnetcorerazor, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 17 to 18 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 19 to 20 (<) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.relational.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 21 to 29 (GetCount) with scopes text.aspnetcorerazor, meta.statement.for.razor, entity.name.function.cs
+ - token from 29 to 30 (() with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 30 to 31 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 31 to 32 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 33 to 34 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 34 to 36 (++) with scopes text.aspnetcorerazor, meta.statement.for.razor, keyword.operator.increment.cs
+ - token from 36 to 37 ()) with scopes text.aspnetcorerazor, meta.statement.for.razor, punctuation.parenthesis.close.cs
+ - token from 37 to 39 () ) with scopes text.aspnetcorerazor, meta.statement.for.razor
+ - token from 39 to 40 ({) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 40 to 41 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 41 to 44 (var) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 44 to 45 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 45 to 46 (x) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 46 to 47 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 47 to 48 (=) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 48 to 49 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 49 to 52 (123) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 52 to 53 (;) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 53 to 54 (<) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 54 to 55 (p) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 55 to 56 (>) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 56 to 68 (Hello World ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 68 to 69 (@) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 69 to 70 (i) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 70 to 72 (</) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 72 to 73 (p) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 73 to 74 (>) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 74 to 75 ( ) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 75 to 76 (}) with scopes text.aspnetcorerazor, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Awaited foreach 1`] = `
+"Line: @await foreach (var value in Values)) { var x = 123;<p>Hello World @value</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.cshtml.transition
+ - token from 1 to 7 (await ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.other.await.cs
+ - token from 7 to 14 (foreach) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 19 (var) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.other.var.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 20 to 25 (value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 26 to 28 (in) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 29 to 35 (Values) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 35 to 36 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+ - token from 36 to 38 () ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 38 to 39 ({) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 40 to 43 (var) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 43 to 44 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 44 to 45 (x) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 45 to 46 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 46 to 47 (=) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 47 to 48 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 48 to 51 (123) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 51 to 52 (;) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 52 to 53 (<) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 53 to 54 (p) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 54 to 55 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 55 to 67 (Hello World ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 67 to 68 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 68 to 73 (value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 73 to 75 (</) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 75 to 76 (p) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 76 to 77 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 77 to 78 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 78 to 79 (}) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Incomplete await foreach statement, no condition 1`] = `
+"Line: @await foreach {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 7 (await ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, keyword.other.await.cs
+ - token from 7 to 14 (foreach) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 14 to 18 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Incomplete await foreach statement, no condition or body 1`] = `
+"Line: @await foreach
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 7 (await ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, keyword.other.await.cs
+ - token from 7 to 14 (foreach) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Incomplete foreach statement, no condition 1`] = `
+"Line: @foreach {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 8 (foreach) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 8 to 12 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Incomplete foreach statement, no condition or body 1`] = `
+"Line: @foreach
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 8 (foreach) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Multi line body 1`] = `
+"Line: @foreach (List<int> numbers in LotsOfNumbers)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.cshtml.transition
+ - token from 1 to 8 (foreach) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 10 to 14 (List) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 20 to 27 (numbers) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 27 to 28 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 28 to 30 (in) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 31 to 44 (LotsOfNumbers) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 44 to 45 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @foreach (int i in numbers) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.control.cshtml.transition
+ - token from 9 to 16 (foreach) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 18 to 21 (int) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.type.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 22 to 23 (i) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 24 to 26 (in) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 27 to 34 (numbers) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 34 to 35 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+ - token from 35 to 36 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 36 to 37 ({) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p>@i</p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 16 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 16 to 17 (i) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 17 to 19 (</) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 19 to 20 (p) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Multi line condition 1`] = `
+"Line: @foreach (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.cshtml.transition
+ - token from 1 to 8 (foreach) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+
+Line:     var value in await GetMaxIncrementCount(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 8 to 13 (value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 14 to 16 (in) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 17 to 22 (await) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.other.await.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 23 to 43 (GetMaxIncrementCount) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.function.cs
+ - token from 43 to 44 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.separator.comma.cs
+
+Line:         name: "The Good Value",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.foreach.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 29 (The Good Value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, string.quoted.double.cs
+ - token from 29 to 30 (") with scopes text.aspnetcorerazor, meta.statement.foreach.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 30 to 31 (,) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.separator.comma.cs
+
+Line:         })
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.curlybrace.close.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+
+Line: ){@value}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 2 to 3 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 3 to 8 (value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     foreach (var i in numbers) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 4 to 11 (foreach) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 16 (var) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.other.var.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 17 to 18 (i) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 19 to 21 (in) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 22 to 29 (numbers) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 29 to 30 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor
+ - token from 31 to 32 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     foreach (is not) an English word
+ - token from 0 to 37 (    foreach (is not) an English word) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @foreach ( ... ) { ... } Single line 1`] = `
+"Line: @foreach (var value in Values)) { var x = 123;<p>Hello World @value</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.cshtml.transition
+ - token from 1 to 8 (foreach) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 10 to 13 (var) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.other.var.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 14 to 19 (value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 20 to 22 (in) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 23 to 29 (Values) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 29 to 30 ()) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+ - token from 30 to 32 () ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor
+ - token from 32 to 33 ({) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 34 to 37 (var) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 37 to 38 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 38 to 39 (x) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 40 to 41 (=) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 41 to 42 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 42 to 45 (123) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 45 to 46 (;) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 46 to 47 (<) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 47 to 48 (p) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 49 to 61 (Hello World ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 61 to 62 (@) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 62 to 67 (value) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 67 to 69 (</) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 69 to 70 (p) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 70 to 71 (>) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 71 to 72 ( ) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 72 to 73 (}) with scopes text.aspnetcorerazor, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @functions directive Incomplete code block 1`] = `
+"Line: @functions {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+"
+`;
+
+exports[`Grammar tests @functions directive Multi line 1`] = `
+"Line: @functions {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     private int currentCount = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 28 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.field.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 (0) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:     private void IncrementCount()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 31 (IncrementCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         var someString = "{ var ThisShouldNotBeCSharp = true; }";
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 22 (someString) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 26 to 63 ({ var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 63 to 64 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 64 to 65 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         currentCount++;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 20 (currentCount) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.increment.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @functions directive Multi-line comment with curly braces 1`] = `
+"Line: @functions { /* { var ThisShouldNotBeCSharp = true; } */ }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 13 to 15 (/*) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.block.cs, punctuation.definition.comment.cs
+ - token from 15 to 54 ( { var ThisShouldNotBeCSharp = true; } ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.block.cs
+ - token from 54 to 56 (*/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.block.cs, punctuation.definition.comment.cs
+ - token from 56 to 57 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 57 to 58 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @functions directive No code block 1`] = `
+"Line: @functions
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+"
+`;
+
+exports[`Grammar tests @functions directive Single line 1`] = `
+"Line: @functions { public void Foo() {} }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 13 to 19 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 20 to 24 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 25 to 28 (Foo) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 28 to 29 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 29 to 30 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 31 to 32 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 32 to 33 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 34 to 35 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @functions directive Single-line comment with curly braces 1`] = `
+"Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor
+
+Line: @functions {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     // { var ThisShouldNotBeCSharp = true; }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.whitespace.comment.leading.cs
+ - token from 4 to 6 (//) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.line.double-slash.cs, punctuation.definition.comment.cs
+ - token from 6 to 44 ( { var ThisShouldNotBeCSharp = true; }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, comment.line.double-slash.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @functions directive With Razor and markup 1`] = `
+"Line: @functions {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     private void SomeMethod()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 11 (private) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 16 (void) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 17 to 27 (SomeMethod) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 27 to 28 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 28 to 29 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         <p>This method <strong>is really</strong> nice!
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 11 to 15 (This) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 22 (method) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 24 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 24 to 30 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 30 to 31 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 31 to 33 (is) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.other.is.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 34 to 40 (really) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 42 to 48 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 49 to 50 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 50 to 54 (nice) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 54 to 55 (!) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.logical.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:             @if(true) {
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 15 (@if) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 16 to 20 (true) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, constant.language.boolean.true.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 22 to 23 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:                 <input type="checkbox" value="true" name="Something" />
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 16 to 17 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 17 to 22 (input) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 27 (type) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 27 to 28 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 28 to 29 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 29 to 37 (checkbox) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 37 to 38 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 38 to 39 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 39 to 44 (value) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 44 to 45 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 45 to 46 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 46 to 50 (true) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 50 to 51 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 52 to 56 (name) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 56 to 57 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 57 to 58 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 58 to 67 (Something) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 67 to 68 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 68 to 69 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 69 to 70 (/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 70 to 71 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+
+Line:             }
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 12 to 14 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:         </p>
+ - token from 0 to 10 (        </) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 10 to 11 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 11 to 13 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:         @DateTime.Now
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 17 (@DateTime) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 17 to 18 (.) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 18 to 21 (Now) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line:         <input type="hidden" value=" { true }" name="Something">
+ - token from 0 to 9 (        <) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 9 to 14 (input) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 15 to 19 (type) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 19 to 20 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 20 to 21 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 21 to 27 (hidden) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 27 to 28 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 34 (value) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 34 to 35 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 35 to 36 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 36 to 45 ( { true }) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 45 to 46 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 46 to 47 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 47 to 51 (name) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 51 to 52 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 52 to 53 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 53 to 62 (Something) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs
+ - token from 62 to 63 (") with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 63 to 64 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 6 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+
+Line: }
+ - token from 0 to 2 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Incomplete if statement, no condition 1`] = `
+"Line: @if {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 3 to 7 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Incomplete if statement, no condition or body 1`] = `
+"Line: @if
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Multi line body 1`] = `
+"Line: @if (1 + 1 == 2)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 6 (1) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.numeric.decimal.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 7 to 8 (+) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.operator.arithmetic.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 9 to 10 (1) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.numeric.decimal.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 11 to 13 (==) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.operator.comparison.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 14 to 15 (2) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.numeric.decimal.cs
+ - token from 15 to 16 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @if ( AnotherCondition() ) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 9 to 11 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 14 to 30 (AnotherCondition) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, entity.name.function.cs
+ - token from 30 to 31 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 31 to 32 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 35 to 36 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }else if (true){}
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 1 to 5 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 6 to 8 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.if.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.open.cs
+ - token from 10 to 14 (true) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.language.boolean.true.cs
+ - token from 14 to 15 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.close.cs
+ - token from 15 to 16 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 16 to 17 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Multi line condition 1`] = `
+"Line: @if (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetTrueValue(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 10 to 22 (GetTrueValue) with scopes text.aspnetcorerazor, meta.statement.if.razor, entity.name.function.cs
+ - token from 22 to 23 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.separator.comma.cs
+
+Line:         name: "The Good Identifier",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.if.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.if.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 34 (The Good Identifier) with scopes text.aspnetcorerazor, meta.statement.if.razor, string.quoted.double.cs
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.statement.if.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 35 to 36 (,) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.if.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.curlybrace.close.cs
+
+Line: )){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 3 to 4 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     if (true) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 4 to 6 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 12 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 12 to 13 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     if (this is classified) we have a problem
+ - token from 0 to 46 (    if (this is classified) we have a problem) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @if ( ... ) { ... } Single line 1`] = `
+"Line: @if (true) { var x = 123;<p>Hello World</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 13 to 16 (var) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 17 to 18 (x) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 19 to 20 (=) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 21 to 24 (123) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 24 to 25 (;) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 25 to 26 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 26 to 27 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 27 to 28 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 28 to 39 (Hello World) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 39 to 41 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 41 to 42 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 43 to 44 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 44 to 45 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @implements directive Incomplete type, generic 1`] = `
+"Line: @implements SomeInterface<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 11 (implements) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.implements
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 12 to 25 (SomeInterface) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 25 to 26 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 26 to 32 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+"
+`;
+
+exports[`Grammar tests @implements directive No type 1`] = `
+"Line: @implements
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 11 (implements) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.implements
+"
+`;
+
+exports[`Grammar tests @implements directive No type spaced 1`] = `
+"Line: @implements              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 11 (implements) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.implements
+ - token from 11 to 26 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @implements directive Type provided 1`] = `
+"Line: @implements Person
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 11 (implements) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.implements
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 12 to 18 (Person) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @implements directive Type provided spaced 1`] = `
+"Line: @implements              Person         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 11 (implements) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.implements
+ - token from 11 to 25 (              ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 25 to 31 (Person) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 31 to 41 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @inherits directive Incomplete type, generic 1`] = `
+"Line: @inherits SomeViewBase<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 9 (inherits) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inherits
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 10 to 22 (SomeViewBase) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 22 to 23 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 23 to 29 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+"
+`;
+
+exports[`Grammar tests @inherits directive No type 1`] = `
+"Line: @inherits
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 9 (inherits) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inherits
+"
+`;
+
+exports[`Grammar tests @inherits directive No type spaced 1`] = `
+"Line: @inherits              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 9 (inherits) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inherits
+ - token from 9 to 24 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @inherits directive Type provided 1`] = `
+"Line: @inherits Person
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 9 (inherits) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inherits
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 10 to 16 (Person) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @inherits directive Type provided spaced 1`] = `
+"Line: @inherits              Person         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 9 (inherits) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inherits
+ - token from 9 to 23 (              ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 23 to 29 (Person) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 29 to 39 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @inject directive Fulfilled inject 1`] = `
+"Line: @inject DateTime TheTime
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 16 (DateTime) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 24 (TheTime) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+"
+`;
+
+exports[`Grammar tests @inject directive Fulfilled inject spaced 1`] = `
+"Line: @inject      DateTime        TheTime         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+ - token from 7 to 13 (      ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 13 to 21 (DateTime) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 21 to 29 (        ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 29 to 36 (TheTime) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+ - token from 36 to 46 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @inject directive Incomplete type, generic 1`] = `
+"Line: @inject List<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 12 (List) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 13 to 19 (string) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+"
+`;
+
+exports[`Grammar tests @inject directive Incomplete type, tuple 1`] = `
+"Line: @inject (string abc, bool def
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.open.cs
+ - token from 9 to 15 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 16 to 19 (abc) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.tuple-element.cs
+ - token from 19 to 20 (,) with scopes text.aspnetcorerazor, meta.directive, punctuation.separator.comma.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 21 to 25 (bool) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 26 to 29 (def) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+"
+`;
+
+exports[`Grammar tests @inject directive Invalid property 1`] = `
+"Line: @inject DateTime !Something
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 16 (DateTime) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 16 to 18 ( !) with scopes text.aspnetcorerazor, meta.directive
+ - token from 18 to 27 (Something) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.property.cs
+"
+`;
+
+exports[`Grammar tests @inject directive No parameters 1`] = `
+"Line: @inject
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+"
+`;
+
+exports[`Grammar tests @inject directive No parameters spaced 1`] = `
+"Line: @inject              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (inject) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.inject
+ - token from 7 to 22 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @layout directive Incomplete type, generic 1`] = `
+"Line: @layout MainLayout<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (layout) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.layout
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 18 (MainLayout) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 18 to 19 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 19 to 25 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+"
+`;
+
+exports[`Grammar tests @layout directive No type 1`] = `
+"Line: @layout
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (layout) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.layout
+"
+`;
+
+exports[`Grammar tests @layout directive No type spaced 1`] = `
+"Line: @layout              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (layout) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.layout
+ - token from 7 to 22 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @layout directive Type provided 1`] = `
+"Line: @layout MainLayout
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (layout) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.layout
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 8 to 18 (MainLayout) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @layout directive Type provided spaced 1`] = `
+"Line: @layout              MainLayout         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 7 (layout) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.layout
+ - token from 7 to 21 (              ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 21 to 31 (MainLayout) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 31 to 41 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Incomplete lock statement, no reference 1`] = `
+"Line: @lock {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 5 (lock) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 5 to 9 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Incomplete lock statement, no reference or body 1`] = `
+"Line: @lock
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 5 (lock) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Multi line body 1`] = `
+"Line: @lock (SomeObject)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.control.cshtml.transition
+ - token from 1 to 5 (lock) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 6 to 7 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 7 to 17 (SomeObject) with scopes text.aspnetcorerazor, meta.statement.lock.razor, variable.other.readwrite.cs
+ - token from 17 to 18 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @lock (GetAnotherObject()) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, keyword.control.cshtml.transition
+ - token from 9 to 13 (lock) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor
+ - token from 14 to 15 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 15 to 31 (GetAnotherObject) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor
+ - token from 35 to 36 ({) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Multi line reference 1`] = `
+"Line: @lock (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.control.cshtml.transition
+ - token from 1 to 5 (lock) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 6 to 7 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetSomeObjectAsync(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 10 to 28 (GetSomeObjectAsync) with scopes text.aspnetcorerazor, meta.statement.lock.razor, entity.name.function.cs
+ - token from 28 to 29 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.lock.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.separator.comma.cs
+
+Line:         name: "The Good Disposable",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.lock.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.lock.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 34 (The Good Disposable) with scopes text.aspnetcorerazor, meta.statement.lock.razor, string.quoted.double.cs
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.statement.lock.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 35 to 36 (,) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.lock.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.lock.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.curlybrace.close.cs
+
+Line: )){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ({) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 3 to 4 (}) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     lock (SomeObject) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor
+ - token from 4 to 8 (lock) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 10 to 20 (SomeObject) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, variable.other.readwrite.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor
+ - token from 22 to 23 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     lock (the taskbar)
+ - token from 0 to 23 (    lock (the taskbar)) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @lock ( ... ) { ... } Single line 1`] = `
+"Line: @lock (someObject) { var x = 123;<p>Hello World</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.control.cshtml.transition
+ - token from 1 to 5 (lock) with scopes text.aspnetcorerazor, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 6 to 7 (() with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 7 to 17 (someObject) with scopes text.aspnetcorerazor, meta.statement.lock.razor, variable.other.readwrite.cs
+ - token from 17 to 18 ()) with scopes text.aspnetcorerazor, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor
+ - token from 19 to 20 ({) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 21 to 24 (var) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 25 to 26 (x) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 27 to 28 (=) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 32 (123) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 33 to 34 (<) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 34 to 35 (p) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 36 to 47 (Hello World) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 47 to 49 (</) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 49 to 50 (p) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 50 to 51 (>) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 52 to 53 (}) with scopes text.aspnetcorerazor, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @model directive Incomplete model, generic 1`] = `
+"Line: @model List<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (model) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.model
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 11 (List) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 11 to 12 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 12 to 18 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+"
+`;
+
+exports[`Grammar tests @model directive Incomplete model, tuple 1`] = `
+"Line: @model (string abc, bool def
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (model) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.model
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.directive, punctuation.parenthesis.open.cs
+ - token from 8 to 14 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 15 to 18 (abc) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.tuple-element.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.directive, punctuation.separator.comma.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 20 to 24 (bool) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 25 to 28 (def) with scopes text.aspnetcorerazor, meta.directive, entity.name.variable.tuple-element.cs
+"
+`;
+
+exports[`Grammar tests @model directive Model provided 1`] = `
+"Line: @model Person
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (model) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.model
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 13 (Person) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @model directive Model provided spaced 1`] = `
+"Line: @model              Person         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (model) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.model
+ - token from 6 to 20 (              ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 20 to 26 (Person) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 26 to 36 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @model directive No model 1`] = `
+"Line: @model
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (model) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.model
+"
+`;
+
+exports[`Grammar tests @model directive No model spaced 1`] = `
+"Line: @model              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (model) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.model
+ - token from 6 to 21 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @namespace directive Broken up namespace 1`] = `
+"Line: @namespace     MyApp  .  Models  .   Data    
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (namespace) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.namespace
+ - token from 10 to 15 (     ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 15 to 20 (MyApp) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 20 to 46 (  .  Models  .   Data    ) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @namespace directive Incomplete namespace 1`] = `
+"Line: @namespace MyApp.
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (namespace) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.namespace
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 16 (MyApp) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 16 to 17 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+"
+`;
+
+exports[`Grammar tests @namespace directive Namespace provided 1`] = `
+"Line: @namespace MyApp
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (namespace) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.namespace
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 16 (MyApp) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+"
+`;
+
+exports[`Grammar tests @namespace directive Namespace provided spaced 1`] = `
+"Line: @namespace     MyApp.Models.Data    
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (namespace) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.namespace
+ - token from 10 to 15 (     ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 15 to 20 (MyApp) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 20 to 21 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 21 to 27 (Models) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 27 to 28 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 28 to 32 (Data) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 32 to 37 (    ) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @namespace directive No namespace 1`] = `
+"Line: @namespace
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (namespace) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.namespace
+"
+`;
+
+exports[`Grammar tests @namespace directive No namespace spaced 1`] = `
+"Line: @namespace              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 10 (namespace) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.namespace
+ - token from 10 to 25 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @page directive Incomplete route 1`] = `
+"Line: @page "
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 5 (page) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.page
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 6 to 7 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+"
+`;
+
+exports[`Grammar tests @page directive No route 1`] = `
+"Line: @page
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 5 (page) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.page
+"
+`;
+
+exports[`Grammar tests @page directive No route spaced 1`] = `
+"Line: @page              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 5 (page) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.page
+ - token from 5 to 20 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @page directive Routed 1`] = `
+"Line: @page "/counter"
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 5 (page) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.page
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 6 to 7 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 7 to 15 (/counter) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 15 to 16 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+"
+`;
+
+exports[`Grammar tests @page directive Routed spaced 1`] = `
+"Line: @page              "/counter"         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 5 (page) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.page
+ - token from 5 to 19 (              ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 19 to 20 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 20 to 28 (/counter) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 28 to 29 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 29 to 39 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @removeTagHelper directive Incomplete parameter 1`] = `
+"Line: @removeTagHelper "
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (removeTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.removeTagHelper
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+"
+`;
+
+exports[`Grammar tests @removeTagHelper directive No parameter 1`] = `
+"Line: @removeTagHelper
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (removeTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.removeTagHelper
+"
+`;
+
+exports[`Grammar tests @removeTagHelper directive No parameter, spaced 1`] = `
+"Line: @removeTagHelper                 
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (removeTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.removeTagHelper
+ - token from 16 to 34 (                 ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @removeTagHelper directive Quoted parameter 1`] = `
+"Line: @removeTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (removeTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.removeTagHelper
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 18 to 56 (*, Microsoft.AspNetCore.Mvc.TagHelpers) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 56 to 57 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+"
+`;
+
+exports[`Grammar tests @removeTagHelper directive Quoted parameter spaced 1`] = `
+"Line: @removeTagHelper       "*     ,      Microsoft.AspNetCore.Mvc.TagHelpers   "            
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (removeTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.removeTagHelper
+ - token from 16 to 23 (       ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 23 to 24 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 24 to 75 (*     ,      Microsoft.AspNetCore.Mvc.TagHelpers   ) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 75 to 76 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 76 to 89 (            ) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+"
+`;
+
+exports[`Grammar tests @removeTagHelper directive Unquoted parameter 1`] = `
+"Line: @removeTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (removeTagHelper) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.removeTagHelper
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 56 (*, Microsoft.AspNetCore.Mvc.TagHelpers) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+"
+`;
+
+exports[`Grammar tests @section directive As C# local 1`] = `
+"Line: @section.method()
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 8 to 9 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 9 to 15 (method) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 16 to 17 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests @section directive Invalid name 1`] = `
+"Line: @section -$*&^
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 9 to 15 (-$*&^) with scopes text.aspnetcorerazor, meta.directive.block
+"
+`;
+
+exports[`Grammar tests @section directive Multi line complex 1`] = `
+"Line: @section Name {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 9 to 13 (Name) with scopes text.aspnetcorerazor, meta.directive.block, variable.other.razor.directive.sectionName
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.open
+
+Line:     <section>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.tag.structure.section.start.html, punctuation.definition.tag.begin.html
+ - token from 5 to 12 (section) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.tag.structure.section.start.html, entity.name.tag.html
+ - token from 12 to 13 (>) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.tag.structure.section.start.html, punctuation.definition.tag.end.html
+
+Line:         @DateTime.Now
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 9 to 17 (DateTime) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 17 to 18 (.) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, source.cs
+ - token from 18 to 21 (Now) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+
+Line:         @section INVALID {}
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block, keyword.control.cshtml.transition
+ - token from 9 to 16 (section) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block, keyword.control.razor.directive.section
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block
+ - token from 17 to 24 (INVALID) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block, variable.other.razor.directive.sectionName
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block
+ - token from 25 to 26 ({) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.open
+ - token from 26 to 27 (}) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.close
+
+Line:     </section>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.tag.structure.section.end.html, punctuation.definition.tag.begin.html
+ - token from 6 to 13 (section) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.tag.structure.section.end.html, entity.name.tag.html
+ - token from 13 to 14 (>) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.tag.structure.section.end.html, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @section directive Multi line incomplete body 1`] = `
+"Line: @section
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+
+Line: Name
+ - token from 0 to 5 (Name) with scopes text.aspnetcorerazor, meta.directive.block
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.open
+"
+`;
+
+exports[`Grammar tests @section directive No name 1`] = `
+"Line: @section
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+"
+`;
+
+exports[`Grammar tests @section directive No name, spaced 1`] = `
+"Line: @section                 
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+ - token from 8 to 26 (                 ) with scopes text.aspnetcorerazor, meta.directive.block
+"
+`;
+
+exports[`Grammar tests @section directive Single line 1`] = `
+"Line: @section Name {@DateTime.Now}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 9 to 13 (Name) with scopes text.aspnetcorerazor, meta.directive.block, variable.other.razor.directive.sectionName
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.open
+ - token from 15 to 16 (@) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 16 to 24 (DateTime) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 24 to 25 (.) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, source.cs
+ - token from 25 to 28 (Now) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 28 to 29 (}) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests @section directive Single line incomplete body 1`] = `
+"Line: @section Name {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.cshtml.transition
+ - token from 1 to 8 (section) with scopes text.aspnetcorerazor, meta.directive.block, keyword.control.razor.directive.section
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 9 to 13 (Name) with scopes text.aspnetcorerazor, meta.directive.block, variable.other.razor.directive.sectionName
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive.block
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.directive.block, meta.structure.razor.directive.markblock, keyword.control.razor.directive.codeblock.open
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Incomplete switch statement, no cases 1`] = `
+"Line: @switch (condition) {Console.WriteLine("Invalid?")}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.cshtml.transition
+ - token from 1 to 7 (switch) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 18 (condition) with scopes text.aspnetcorerazor, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 18 to 19 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 20 to 21 ({) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+ - token from 21 to 28 (Console) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, variable.other.object.cs
+ - token from 28 to 29 (.) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.accessor.cs
+ - token from 29 to 38 (WriteLine) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.function.cs
+ - token from 38 to 39 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.parenthesis.open.cs
+ - token from 39 to 40 (") with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 40 to 48 (Invalid?) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, string.quoted.double.cs
+ - token from 48 to 49 (") with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 49 to 50 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.parenthesis.close.cs
+ - token from 50 to 51 (}) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Incomplete switch statement, no condition 1`] = `
+"Line: @switch {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 7 (switch) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 7 to 11 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Incomplete switch statement, no condition or body 1`] = `
+"Line: @switch
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 7 (switch) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Multi line body 1`] = `
+"Line: @switch (SomeProperty)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.cshtml.transition
+ - token from 1 to 7 (switch) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 21 (SomeProperty) with scopes text.aspnetcorerazor, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 21 to 22 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+
+Line:     case 123:
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 4 to 8 (case) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.case.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 9 to 12 (123) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.numeric.decimal.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.separator.colon.cs
+
+Line:         var x = 123;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 11 (var) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.other.var.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 13 (x) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.variable.local.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 14 to 15 (=) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.assignment.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 16 to 19 (123) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.numeric.decimal.cs
+ - token from 19 to 20 (;) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line:         <div>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 9 to 12 (div) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 12 to 13 (>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+
+Line:             @switch (GetAnotherValue()) {
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 13 (@) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, keyword.control.cshtml.transition
+ - token from 13 to 19 (switch) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor
+ - token from 20 to 21 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 21 to 36 (GetAnotherValue) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, entity.name.function.cs
+ - token from 36 to 37 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 37 to 38 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 38 to 39 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor
+ - token from 40 to 41 ({) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+
+Line:                 case: 456
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 16 to 20 (case) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.label.cs
+ - token from 20 to 21 (:) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.separator.colon.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 22 to 25 (456) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.numeric.decimal.cs
+
+Line:                     <p></p>
+ - token from 0 to 20 (                    ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 20 to 21 (<) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 21 to 22 (p) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+ - token from 23 to 25 (</) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 25 to 26 (p) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 26 to 27 (>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+
+Line:                 break;
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 16 to 21 (break) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.flow.break.cs
+ - token from 21 to 22 (;) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line:             }
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 13 (}) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+
+Line:         </div>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 10 (</) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 10 to 13 (div) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 13 to 14 (>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+
+Line:         break;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 13 (break) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.flow.break.cs
+ - token from 13 to 14 (;) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Multi line condition 1`] = `
+"Line: @switch (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.cshtml.transition
+ - token from 1 to 7 (switch) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetAValue(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 10 to 19 (GetAValue) with scopes text.aspnetcorerazor, meta.statement.switch.razor, entity.name.function.cs
+ - token from 19 to 20 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.switch.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.separator.comma.cs
+
+Line:         name: "Hello",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.switch.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.switch.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 20 (Hello) with scopes text.aspnetcorerazor, meta.statement.switch.razor, string.quoted.double.cs
+ - token from 20 to 21 (") with scopes text.aspnetcorerazor, meta.statement.switch.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 21 to 22 (,) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.switch.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.curlybrace.close.cs
+
+Line: )){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ({) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+ - token from 3 to 4 (}) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     switch (SomeProp) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor
+ - token from 4 to 10 (switch) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor
+ - token from 11 to 12 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 12 to 20 (SomeProp) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor
+ - token from 22 to 23 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+
+Line:         case 123:
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 12 (case) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.case.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 13 to 16 (123) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.numeric.decimal.cs
+ - token from 16 to 17 (:) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.separator.colon.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+
+Line:             break;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 17 (break) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.flow.break.cs
+ - token from 17 to 18 (;) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     switch (over to better classifications)
+ - token from 0 to 44 (    switch (over to better classifications)) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @switch ( ... ) { ... } Single line 1`] = `
+"Line: @switch (   value  ) { case 123: var x = 123;<p>Hello World</p>break; }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.cshtml.transition
+ - token from 1 to 7 (switch) with scopes text.aspnetcorerazor, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 12 (   ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 12 to 17 (value) with scopes text.aspnetcorerazor, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 17 to 19 (  ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor
+ - token from 21 to 22 ({) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 23 to 27 (case) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.case.cs
+ - token from 27 to 28 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 28 to 31 (123) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.numeric.decimal.cs
+ - token from 31 to 32 (:) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.separator.colon.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 33 to 36 (var) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.other.var.cs
+ - token from 36 to 37 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 37 to 38 (x) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.variable.local.cs
+ - token from 38 to 39 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 39 to 40 (=) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.assignment.cs
+ - token from 40 to 41 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 41 to 44 (123) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.numeric.decimal.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+ - token from 45 to 46 (<) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 46 to 47 (p) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 47 to 48 (>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+ - token from 48 to 59 (Hello World) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 59 to 61 (</) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 61 to 62 (p) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 62 to 63 (>) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+ - token from 63 to 68 (break) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.flow.break.cs
+ - token from 68 to 69 (;) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+ - token from 69 to 70 ( ) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 70 to 71 (}) with scopes text.aspnetcorerazor, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @tagHelperPrefix directive Incomplete parameter 1`] = `
+"Line: @tagHelperPrefix "
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (tagHelperPrefix) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.tagHelperPrefix
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+"
+`;
+
+exports[`Grammar tests @tagHelperPrefix directive No parameter 1`] = `
+"Line: @tagHelperPrefix
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (tagHelperPrefix) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.tagHelperPrefix
+"
+`;
+
+exports[`Grammar tests @tagHelperPrefix directive No parameter, spaced 1`] = `
+"Line: @tagHelperPrefix                 
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (tagHelperPrefix) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.tagHelperPrefix
+ - token from 16 to 34 (                 ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @tagHelperPrefix directive Quoted parameter 1`] = `
+"Line: @tagHelperPrefix "th:"
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (tagHelperPrefix) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.tagHelperPrefix
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 18 to 21 (th:) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 21 to 22 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+"
+`;
+
+exports[`Grammar tests @tagHelperPrefix directive Quoted parameter spaced 1`] = `
+"Line: @tagHelperPrefix       "th:   "            
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (tagHelperPrefix) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.tagHelperPrefix
+ - token from 16 to 23 (       ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 23 to 24 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 24 to 30 (th:   ) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+ - token from 30 to 31 (") with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 31 to 44 (            ) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+"
+`;
+
+exports[`Grammar tests @tagHelperPrefix directive Unquoted parameter 1`] = `
+"Line: @tagHelperPrefix th:
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 16 (tagHelperPrefix) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.directive.tagHelperPrefix
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 21 (th:) with scopes text.aspnetcorerazor, meta.directive, string.quoted.double.cs
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Incomplete try statement, no body 1`] = `
+"Line: @try
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (try) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.try.cs
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Incomplete try statement, no catch or finally 1`] = `
+"Line: @try {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (try) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.try.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor
+ - token from 5 to 6 ({) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 6 to 7 (}) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Multi line catch 1`] = `
+"Line: @try
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (try) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.try.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: catch (
+ - token from 0 to 5 (catch) with scopes text.aspnetcorerazor, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 6 to 7 (() with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+
+Line:     InvalidOperationException
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 4 to 29 (InvalidOperationException) with scopes text.aspnetcorerazor, meta.statement.catch.razor, entity.name.type.cs
+
+Line:     ex){}
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 4 to 6 (ex) with scopes text.aspnetcorerazor, meta.statement.catch.razor, entity.name.type.cs
+ - token from 6 to 7 ()) with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 7 to 8 ({) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Multi line complex 1`] = `
+"Line: @try
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (try) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.try.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     Console.WriteLine("Invoking!");
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 11 (Console) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, variable.other.object.cs
+ - token from 11 to 12 (.) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.accessor.cs
+ - token from 12 to 21 (WriteLine) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.function.cs
+ - token from 21 to 22 (() with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.parenthesis.open.cs
+ - token from 22 to 23 (") with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 23 to 32 (Invoking!) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, string.quoted.double.cs
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.parenthesis.close.cs
+ - token from 34 to 35 (;) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>Invoked: @SomeMethod()</div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 9 to 18 (Invoked: ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 18 to 19 (@) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 19 to 29 (SomeMethod) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 29 to 30 (() with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 30 to 31 ()) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 31 to 33 (</) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 33 to 36 (div) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 36 to 37 (>) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: } catch (InvalidOperationExeption ex) when (ex != null)
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 1 to 2 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 2 to 7 (catch) with scopes text.aspnetcorerazor, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 33 (InvalidOperationExeption) with scopes text.aspnetcorerazor, meta.statement.catch.razor, entity.name.type.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 34 to 36 (ex) with scopes text.aspnetcorerazor, meta.statement.catch.razor, entity.name.variable.local.cs
+ - token from 36 to 37 ()) with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 37 to 38 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 38 to 42 (when) with scopes text.aspnetcorerazor, meta.statement.catch.razor, keyword.control.try.when.cs
+ - token from 42 to 43 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 43 to 44 (() with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 44 to 46 (ex) with scopes text.aspnetcorerazor, meta.statement.catch.razor, variable.other.readwrite.cs
+ - token from 46 to 47 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 47 to 49 (!=) with scopes text.aspnetcorerazor, meta.statement.catch.razor, keyword.operator.comparison.cs
+ - token from 49 to 50 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 50 to 54 (null) with scopes text.aspnetcorerazor, meta.statement.catch.razor, constant.language.null.cs
+ - token from 54 to 55 ()) with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @try {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, keyword.control.cshtml.transition
+ - token from 9 to 12 (try) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, keyword.control.try.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor
+ - token from 13 to 14 ({) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p>Error occurred</p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 29 (Error occurred) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 31 (</) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 31 to 32 (p) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 32 to 33 (>) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:             throw;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 17 (throw) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.control.flow.throw.cs
+ - token from 17 to 18 (;) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         } catch(Exception ex) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor
+ - token from 10 to 15 (catch) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 25 (Exception) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, entity.name.type.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor
+ - token from 26 to 28 (ex) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, entity.name.variable.local.cs
+ - token from 28 to 29 ()) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 29 to 30 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor
+ - token from 30 to 31 ({) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+
+Line:         } finally { <strong>In the finally</strong> }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor
+ - token from 10 to 17 (finally) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, keyword.control.try.finally.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor
+ - token from 18 to 19 ({) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 21 (<) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 21 to 27 (strong) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 27 to 28 (>) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 28 to 42 (In the finally) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock
+ - token from 42 to 44 (</) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 44 to 50 (strong) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 50 to 51 (>) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock
+ - token from 52 to 53 (}) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }finally{}
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 1 to 8 (finally) with scopes text.aspnetcorerazor, meta.statement.finally.razor, keyword.control.try.finally.cs
+ - token from 8 to 9 ({) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 9 to 10 (}) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     try {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor
+ - token from 4 to 7 (try) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, keyword.control.try.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor
+ - token from 8 to 9 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     } catch(Exception ex) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor
+ - token from 6 to 11 (catch) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 11 to 12 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 12 to 21 (Exception) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, entity.name.type.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor
+ - token from 22 to 24 (ex) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, entity.name.variable.local.cs
+ - token from 24 to 25 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor
+ - token from 26 to 27 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     try not to classify this
+ - token from 0 to 29 (    try not to classify this) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @try { ... } catch/finally { ... } Single line 1`] = `
+"Line: @try { var x = 123;<p>Hello World</p> } catch (Exception ex) {@DateTime.Now}finally{<section></section>var y = 456;}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.cshtml.transition
+ - token from 1 to 4 (try) with scopes text.aspnetcorerazor, meta.statement.try.razor, keyword.control.try.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor
+ - token from 5 to 6 ({) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 7 to 10 (var) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 11 to 12 (x) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 13 to 14 (=) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 15 to 18 (123) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 18 to 19 (;) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 19 to 20 (<) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 20 to 21 (p) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 22 to 33 (Hello World) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 33 to 35 (</) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 35 to 36 (p) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 36 to 37 (>) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 37 to 38 ( ) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 38 to 39 (}) with scopes text.aspnetcorerazor, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 40 to 45 (catch) with scopes text.aspnetcorerazor, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 45 to 46 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 46 to 47 (() with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 47 to 56 (Exception) with scopes text.aspnetcorerazor, meta.statement.catch.razor, entity.name.type.cs
+ - token from 56 to 57 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 57 to 59 (ex) with scopes text.aspnetcorerazor, meta.statement.catch.razor, entity.name.variable.local.cs
+ - token from 59 to 60 ()) with scopes text.aspnetcorerazor, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 60 to 61 ( ) with scopes text.aspnetcorerazor, meta.statement.catch.razor
+ - token from 61 to 62 ({) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 62 to 63 (@) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 63 to 71 (DateTime) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 71 to 72 (.) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs
+ - token from 72 to 75 (Now) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 75 to 76 (}) with scopes text.aspnetcorerazor, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 76 to 83 (finally) with scopes text.aspnetcorerazor, meta.statement.finally.razor, keyword.control.try.finally.cs
+ - token from 83 to 84 ({) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 84 to 85 (<) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 85 to 92 (section) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 92 to 93 (>) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 93 to 95 (</) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 95 to 102 (section) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 102 to 103 (>) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 103 to 106 (var) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 106 to 107 ( ) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock
+ - token from 107 to 108 (y) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 108 to 109 ( ) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock
+ - token from 109 to 110 (=) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 110 to 111 ( ) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock
+ - token from 111 to 114 (456) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 114 to 115 (;) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 115 to 116 (}) with scopes text.aspnetcorerazor, meta.statement.finally.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Incomplete using statement, no condition 1`] = `
+"Line: @using {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 9 ({}) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Incomplete using statement, no condition or body 1`] = `
+"Line: @using
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Multi line body 1`] = `
+"Line: @using (SomeDisposable)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 22 (SomeDisposable) with scopes text.aspnetcorerazor, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 22 to 23 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @using (GetAnotherDisposable()) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.control.cshtml.transition
+ - token from 9 to 14 (using) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.other.using.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 36 (GetAnotherDisposable) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, entity.name.function.cs
+ - token from 36 to 37 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 37 to 38 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 38 to 39 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 40 to 41 ({) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Multi line condition 1`] = `
+"Line: @using (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetSomeDisposableAsync(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 10 to 32 (GetSomeDisposableAsync) with scopes text.aspnetcorerazor, meta.statement.using.razor, entity.name.function.cs
+ - token from 32 to 33 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.using.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.separator.comma.cs
+
+Line:         name: "The Good Disposable",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.using.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.using.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 34 (The Good Disposable) with scopes text.aspnetcorerazor, meta.statement.using.razor, string.quoted.double.cs
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.statement.using.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 35 to 36 (,) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.using.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.curlybrace.close.cs
+
+Line: )){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ({) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 3 to 4 (}) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     using (SomeDisposable) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 4 to 9 (using) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.other.using.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 10 to 11 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 11 to 25 (SomeDisposable) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 25 to 26 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 27 to 28 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 13 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Not in HTML 1`] = `
+"Line: <div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+
+Line:     using (the best potatoes)
+ - token from 0 to 30 (    using (the best potatoes)) with scopes text.aspnetcorerazor
+
+Line: </div>
+ - token from 0 to 2 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 5 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests @using ( ... ) { ... } Single line 1`] = `
+"Line: @using (someDisposable) { var x = 123;<p>Hello World</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.statement.using.razor, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 22 (someDisposable) with scopes text.aspnetcorerazor, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 22 to 23 ()) with scopes text.aspnetcorerazor, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor
+ - token from 24 to 25 ({) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 26 to 29 (var) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 29 to 30 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 30 to 31 (x) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 31 to 32 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (=) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 33 to 34 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 34 to 37 (123) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 37 to 38 (;) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 38 to 39 (<) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 39 to 40 (p) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 40 to 41 (>) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 41 to 52 (Hello World) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 52 to 54 (</) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 54 to 55 (p) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 55 to 56 (>) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 56 to 57 ( ) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 57 to 58 (}) with scopes text.aspnetcorerazor, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @using directive As C# local 1`] = `
+"Line: @using.method()
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 6 to 7 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 7 to 13 (method) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 13 to 14 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 14 to 15 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests @using directive Standard using 1`] = `
+"Line: @using System.IO
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 13 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 13 to 14 (.) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 16 (IO) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+"
+`;
+
+exports[`Grammar tests @using directive Standard using spaced 1`] = `
+"Line: @using              System.IO         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 20 (              ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 20 to 26 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 26 to 27 (.) with scopes text.aspnetcorerazor, meta.directive
+ - token from 27 to 29 (IO) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 29 to 38 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Standard using, no namespace 1`] = `
+"Line: @using
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+"
+`;
+
+exports[`Grammar tests @using directive Standard using, no namespace spaced 1`] = `
+"Line: @using              
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 21 (              ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Standard using, optional semicolon 1`] = `
+"Line: @using System.IO;
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 13 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 13 to 14 (.) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 16 (IO) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 16 to 17 (;) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.optionalSemicolon
+"
+`;
+
+exports[`Grammar tests @using directive Static using 1`] = `
+"Line: @using static System.Math
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 13 (static) with scopes text.aspnetcorerazor, meta.directive, keyword.other.static.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 20 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 20 to 21 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 21 to 25 (Math) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @using directive Static using spaced 1`] = `
+"Line: @using    static          System.Math         
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 10 (    ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 10 to 16 (static) with scopes text.aspnetcorerazor, meta.directive, keyword.other.static.cs
+ - token from 16 to 26 (          ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 26 to 32 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 32 to 33 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 33 to 37 (Math) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 37 to 46 (         ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Static using, no namespace 1`] = `
+"Line: @using static
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 13 (static) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+"
+`;
+
+exports[`Grammar tests @using directive Static using, no namespace spaced 1`] = `
+"Line: @using        static      
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 14 (        ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 20 (static) with scopes text.aspnetcorerazor, meta.directive, keyword.other.static.cs
+ - token from 20 to 25 (     ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Static using, optional semicolon 1`] = `
+"Line: @using static System.Math;
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 13 (static) with scopes text.aspnetcorerazor, meta.directive, keyword.other.static.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 20 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 20 to 21 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 21 to 25 (Math) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 25 to 26 (;) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.optionalSemicolon
+"
+`;
+
+exports[`Grammar tests @using directive Using alias 1`] = `
+"Line: @using TheConsole = System.Console
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 17 (TheConsole) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.alias.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 18 to 19 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 20 to 26 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 26 to 27 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 27 to 34 (Console) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+"
+`;
+
+exports[`Grammar tests @using directive Using alias spaced 1`] = `
+"Line: @using     TheConsole     =    System.Console   
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 11 (     ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 11 to 21 (TheConsole) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.alias.cs
+ - token from 21 to 26 (     ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 26 to 27 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 27 to 31 (    ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 31 to 37 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 37 to 38 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 38 to 45 (Console) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 45 to 48 (   ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Using alias, incomplete type, generic 1`] = `
+"Line: @using TheTime = System.Collections.Generic.List<string
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 14 (TheTime) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.alias.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 15 to 16 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 23 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 23 to 24 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 24 to 35 (Collections) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 35 to 36 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 36 to 43 (Generic) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 43 to 44 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 44 to 48 (List) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 48 to 49 (<) with scopes text.aspnetcorerazor, meta.directive, punctuation.definition.typeparameters.begin.cs
+ - token from 49 to 55 (string) with scopes text.aspnetcorerazor, meta.directive, keyword.type.cs
+"
+`;
+
+exports[`Grammar tests @using directive Using alias, no type 1`] = `
+"Line: @using Something =
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 16 (Something) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.namespace.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 17 to 18 (=) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Using alias, no type spaced 1`] = `
+"Line: @using        Something   =    
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 14 (        ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 14 to 23 (Something) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.alias.cs
+ - token from 23 to 26 (   ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 26 to 27 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 27 to 30 (   ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.directive
+"
+`;
+
+exports[`Grammar tests @using directive Using alias, optional semicolon 1`] = `
+"Line: @using TheConsole = System.Console;
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.directive, keyword.control.cshtml.transition
+ - token from 1 to 6 (using) with scopes text.aspnetcorerazor, meta.directive, keyword.other.using.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 7 to 17 (TheConsole) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.alias.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 18 to 19 (=) with scopes text.aspnetcorerazor, meta.directive, keyword.operator.assignment.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.directive
+ - token from 20 to 26 (System) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 26 to 27 (.) with scopes text.aspnetcorerazor, meta.directive, punctuation.accessor.cs
+ - token from 27 to 34 (Console) with scopes text.aspnetcorerazor, meta.directive, entity.name.type.cs
+ - token from 34 to 35 (;) with scopes text.aspnetcorerazor, meta.directive, keyword.control.razor.optionalSemicolon
+"
+`;
+
+exports[`Grammar tests @while ( ... ) { ... } Incomplete while statement, no condition 1`] = `
+"Line: @while {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 6 (while) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 6 to 10 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests @while ( ... ) { ... } Incomplete while statement, no condition or body 1`] = `
+"Line: @while
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 6 (while) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests @while ( ... ) { ... } Multi line body 1`] = `
+"Line: @while (SomeProperty)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.cshtml.transition
+ - token from 1 to 6 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 20 (SomeProperty) with scopes text.aspnetcorerazor, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @while (GetAnotherValue()) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.cshtml.transition
+ - token from 9 to 14 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 31 (GetAnotherValue) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, entity.name.function.cs
+ - token from 31 to 32 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 32 to 33 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 35 to 36 ({) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @while ( ... ) { ... } Multi line condition 1`] = `
+"Line: @while (
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.cshtml.transition
+ - token from 1 to 6 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetATruthyValue(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 10 to 25 (GetATruthyValue) with scopes text.aspnetcorerazor, meta.statement.while.razor, entity.name.function.cs
+ - token from 25 to 26 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.comma.cs
+
+Line:         name: "Hello",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.while.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.while.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 20 (Hello) with scopes text.aspnetcorerazor, meta.statement.while.razor, string.quoted.double.cs
+ - token from 20 to 21 (") with scopes text.aspnetcorerazor, meta.statement.while.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 21 to 22 (,) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.curlybrace.close.cs
+
+Line: )){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ({) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 3 to 4 (}) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests @while ( ... ) { ... } Nested inside if 1`] = `
+"Line: @if (true)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 9 (true) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     while (SomeProperty {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 4 to 9 (while) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 10 to 11 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 11 to 23 (SomeProperty) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 24 to 25 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.curlybrace.open.cs
+
+Line:         <p></p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.relational.cs
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.relational.cs
+ - token from 11 to 12 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.relational.cs
+ - token from 12 to 13 (/) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.arithmetic.cs
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.relational.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 2 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+"
+`;
+
+exports[`Grammar tests @while ( ... ) { ... } Single line 1`] = `
+"Line: @while (   true  ) { var x = 123;<p>Hello World</p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.cshtml.transition
+ - token from 1 to 6 (while) with scopes text.aspnetcorerazor, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 11 (   ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 11 to 15 (true) with scopes text.aspnetcorerazor, meta.statement.while.razor, constant.language.boolean.true.cs
+ - token from 15 to 17 (  ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 17 to 18 ()) with scopes text.aspnetcorerazor, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor
+ - token from 19 to 20 ({) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 21 to 24 (var) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 25 to 26 (x) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 27 to 28 (=) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 32 (123) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 32 to 33 (;) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 33 to 34 (<) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 34 to 35 (p) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 36 to 47 (Hello World) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 47 to 49 (</) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 49 to 50 (p) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 50 to 51 (>) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 52 to 53 (}) with scopes text.aspnetcorerazor, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Double Quotes Class explicit expression 1`] = `
+"Line: <div class="@(NavMenuCssClass)"></div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html
+ - token from 5 to 10 (class) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 11 to 12 (") with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 12 to 30 (@(NavMenuCssClass)) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.double.html
+ - token from 30 to 31 (") with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 31 to 32 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+ - token from 32 to 34 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 34 to 37 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 37 to 38 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Double Quotes Empty 1`] = `
+"Line: <button @onclick="@()"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 21 (@()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 21 to 22 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 23 to 25 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 25 to 31 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 31 to 32 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Double Quotes Multi line 1`] = `
+"Line: <button @onclick="@(
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 21 (@() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line:     Html.BeginForm(
+ - token from 0 to 20 (    Html.BeginForm() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line:         "Login",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 8 to 9 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 9 to 14 (Login) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.Login.html, entity.other.attribute-name.html
+ - token from 14 to 16 (",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, invalid.illegal.character-not-allowed-here.html
+
+Line:         "Home",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 15 ("Home",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, invalid.illegal.character-not-allowed-here.html
+
+Line:         new
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.new.html, entity.other.attribute-name.html
+
+Line:         {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 9 ({) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.{.html, entity.other.attribute-name.html
+
+Line:             @class = "someClass",
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 12 to 18 (@class) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html, entity.other.attribute-name.html
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html
+ - token from 19 to 20 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html, punctuation.separator.key-value.html
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html
+ - token from 21 to 22 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 22 to 31 (someClass) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html, string.quoted.double.html
+ - token from 31 to 32 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 32 to 33 (,) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.,.html, entity.other.attribute-name.html
+
+Line:             notValid = Html.DisplayFor<object>(
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 12 to 20 (notValid) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.notValid.html, entity.other.attribute-name.html
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.notValid.html
+ - token from 21 to 22 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.notValid.html, punctuation.separator.key-value.html
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.notValid.html
+ - token from 23 to 38 (Html.DisplayFor) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.notValid.html, string.unquoted.html
+ - token from 38 to 45 (<object) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, invalid.illegal.character-not-allowed-here.html
+ - token from 45 to 46 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 46 to 48 (() with scopes text.aspnetcorerazor
+
+Line:                 (_) => Model,
+ - token from 0 to 30 (                (_) => Model,) with scopes text.aspnetcorerazor
+
+Line:                 "name",
+ - token from 0 to 24 (                "name",) with scopes text.aspnetcorerazor
+
+Line:                 "someName",
+ - token from 0 to 28 (                "someName",) with scopes text.aspnetcorerazor
+
+Line:                 new { })
+ - token from 0 to 25 (                new { })) with scopes text.aspnetcorerazor
+
+Line:         })
+ - token from 0 to 11 (        })) with scopes text.aspnetcorerazor
+
+Line: )"></button>
+ - token from 0 to 3 ()">) with scopes text.aspnetcorerazor
+ - token from 3 to 5 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 5 to 11 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 11 to 12 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Double Quotes Onclick explicit expression 1`] = `
+"Line: <button @onclick="@(ToggleNavMenu())"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 36 (@(ToggleNavMenu())) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 36 to 37 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 37 to 38 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 38 to 40 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 40 to 46 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 46 to 47 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Double Quotes Single line complex 1`] = `
+"Line: <button @onclick="@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 127 (@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 127 to 128 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 128 to 129 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 129 to 131 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 131 to 137 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 137 to 138 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Double Quotes Single line simple 1`] = `
+"Line: <button @onclick="@(DateTime.Now)"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 33 (@(DateTime.Now)) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 33 to 34 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 35 to 37 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 37 to 43 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Single Quotes Class explicit expression 1`] = `
+"Line: <div class='@(NavMenuCssClass)'></div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html
+ - token from 5 to 10 (class) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 11 to 12 (') with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 12 to 30 (@(NavMenuCssClass)) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.single.html
+ - token from 30 to 31 (') with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 31 to 32 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+ - token from 32 to 34 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 34 to 37 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 37 to 38 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Single Quotes Empty 1`] = `
+"Line: <button @onclick='@()'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 21 (@()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 21 to 22 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 23 to 25 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 25 to 31 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 31 to 32 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Single Quotes Multi line 1`] = `
+"Line: <button @onclick='@(
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 21 (@() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:     Html.BeginForm(
+ - token from 0 to 20 (    Html.BeginForm() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:         "Login",
+ - token from 0 to 17 (        "Login",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:         "Home",
+ - token from 0 to 16 (        "Home",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:         new
+ - token from 0 to 12 (        new) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:         {
+ - token from 0 to 10 (        {) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:             @class = "someClass",
+ - token from 0 to 34 (            @class = "someClass",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:             notValid = Html.DisplayFor<object>(
+ - token from 0 to 48 (            notValid = Html.DisplayFor<object>() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:                 (_) => Model,
+ - token from 0 to 30 (                (_) => Model,) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:                 "name",
+ - token from 0 to 24 (                "name",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:                 "someName",
+ - token from 0 to 28 (                "someName",) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:                 new { })
+ - token from 0 to 25 (                new { })) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:         })
+ - token from 0 to 11 (        })) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: )'></button>
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 1 to 2 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 2 to 3 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 3 to 5 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 5 to 11 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 11 to 12 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Single Quotes Onclick explicit expression 1`] = `
+"Line: <button @onclick='@(ToggleNavMenu())'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 36 (@(ToggleNavMenu())) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 36 to 37 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 37 to 38 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 38 to 40 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 40 to 46 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 46 to 47 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Single Quotes Single line complex 1`] = `
+"Line: <button @onclick='@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 127 (@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 127 to 128 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 128 to 129 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 129 to 131 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 131 to 137 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 137 to 138 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit Expressions In Attributes Single Quotes Single line simple 1`] = `
+"Line: <button @onclick='@(DateTime.Now)'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 33 (@(DateTime.Now)) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 33 to 34 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 35 to 37 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 37 to 43 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Explicit expressions Empty 1`] = `
+"Line: @()
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+ - token from 2 to 3 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+"
+`;
+
+exports[`Grammar tests Explicit expressions Multi line 1`] = `
+"Line: @(
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+
+Line:     Html.BeginForm(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 4 to 8 (Html) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.object.cs
+ - token from 8 to 9 (.) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.accessor.cs
+ - token from 9 to 18 (BeginForm) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.function.cs
+ - token from 18 to 19 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+
+Line:         "Login",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 9 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 9 to 14 (Login) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 15 to 16 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+
+Line:         "Home",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 9 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 9 to 13 (Home) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs
+ - token from 13 to 14 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 14 to 15 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+
+Line:         new
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.other.new.cs
+
+Line:         {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 9 ({) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.open.cs
+
+Line:             @class = "someClass",
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 12 to 18 (@class) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 19 to 20 (=) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.assignment.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 21 to 22 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 22 to 31 (someClass) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs
+ - token from 31 to 32 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 32 to 33 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+
+Line:             notValid = Html.DisplayFor<object>(
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 12 to 20 (notValid) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 21 to 22 (=) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.assignment.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 23 to 27 (Html) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.object.cs
+ - token from 27 to 28 (.) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.accessor.cs
+ - token from 28 to 38 (DisplayFor) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.function.cs
+ - token from 38 to 39 (<) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.definition.typeparameters.begin.cs
+ - token from 39 to 45 (object) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.type.cs
+ - token from 45 to 46 (>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.definition.typeparameters.end.cs
+ - token from 46 to 47 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+
+Line:                 (_) => Model,
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 16 to 17 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+ - token from 17 to 18 (_) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.variable.parameter.cs
+ - token from 18 to 19 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 20 to 22 (=>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.arrow.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 23 to 28 (Model) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+ - token from 28 to 29 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+
+Line:                 "name",
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 16 to 17 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 17 to 21 (name) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs
+ - token from 21 to 22 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 22 to 23 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+
+Line:                 "someName",
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 16 to 17 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 17 to 25 (someName) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs
+ - token from 25 to 26 (") with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 26 to 27 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+
+Line:                 new { })
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 16 to 19 (new) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.other.new.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 20 to 21 ({) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.open.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 22 to 23 (}) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.close.cs
+ - token from 23 to 24 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+
+Line:         })
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.close.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+
+Line: )
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+"
+`;
+
+exports[`Grammar tests Explicit expressions Single line complex 1`] = `
+"Line: @(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+ - token from 2 to 5 (456) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, constant.numeric.decimal.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 6 to 7 (+) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.arithmetic.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 12 to 17 (Array) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.type.cs
+ - token from 17 to 18 (<) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.definition.typeparameters.begin.cs
+ - token from 18 to 21 (int) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.type.cs
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.definition.typeparameters.end.cs
+ - token from 22 to 23 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+ - token from 23 to 24 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+ - token from 24 to 25 ({) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.open.cs
+ - token from 25 to 26 (1) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, constant.numeric.decimal.cs
+ - token from 26 to 27 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+ - token from 27 to 28 (2) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, constant.numeric.decimal.cs
+ - token from 28 to 29 (,) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.separator.comma.cs
+ - token from 29 to 30 (3) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, constant.numeric.decimal.cs
+ - token from 30 to 31 (}) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.close.cs
+ - token from 31 to 32 ([) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.squarebracket.open.cs
+ - token from 32 to 33 (0) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, constant.numeric.decimal.cs
+ - token from 33 to 34 (]) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.squarebracket.close.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 35 to 36 (+) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.arithmetic.cs
+ - token from 36 to 37 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 37 to 42 (await) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.other.await.cs
+ - token from 42 to 43 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 43 to 56 (GetValueAsync) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.function.cs
+ - token from 56 to 57 (<) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.definition.typeparameters.begin.cs
+ - token from 57 to 63 (string) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.type.cs
+ - token from 63 to 64 (>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.definition.typeparameters.end.cs
+ - token from 64 to 65 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+ - token from 65 to 66 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+ - token from 66 to 67 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 67 to 69 (??) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.null-coalescing.cs
+ - token from 69 to 70 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 70 to 79 (someArray) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.object.property.cs
+ - token from 79 to 80 ([) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.squarebracket.open.cs
+ - token from 80 to 85 (await) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.other.await.cs
+ - token from 85 to 86 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 86 to 97 (DoMoreAsync) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.function.cs
+ - token from 97 to 98 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+ - token from 98 to 99 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+ - token from 99 to 100 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+ - token from 100 to 101 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 101 to 103 (=>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.arrow.cs
+ - token from 103 to 104 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 104 to 105 ({) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.open.cs
+ - token from 105 to 106 (}) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.curlybrace.close.cs
+ - token from 106 to 107 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+ - token from 107 to 108 (]) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.squarebracket.close.cs
+ - token from 108 to 109 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+"
+`;
+
+exports[`Grammar tests Explicit expressions Single line simple 1`] = `
+"Line: @(DateTime.Now)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+ - token from 2 to 10 (DateTime) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.object.cs
+ - token from 10 to 11 (.) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.accessor.cs
+ - token from 11 to 14 (Now) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.object.property.cs
+ - token from 14 to 15 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Awaited method invocation 1`] = `
+"Line: @await AsyncMethod()
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 7 (await ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, keyword.other.await.cs
+ - token from 7 to 18 (AsyncMethod) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 18 to 19 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Awaited property 1`] = `
+"Line: @await AsyncProperty
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 7 (await ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, keyword.other.await.cs
+ - token from 7 to 20 (AsyncProperty) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Close curly prefix 1`] = `
+"Line: }@DateTime.Now
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor
+ - token from 1 to 2 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 2 to 10 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 10 to 11 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 11 to 14 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Close curly suffix 1`] = `
+"Line: @DateTime.Now}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 10 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 10 to 13 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 13 to 15 (}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Close parenthesis suffix 1`] = `
+"Line: @DateTime.Now)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 10 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 10 to 13 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 13 to 15 ()) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Close parenthesis suffix 2`] = `
+"Line: @DateTime.Now]
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 10 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 10 to 13 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 13 to 15 (]) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Combined with HTML 1`] = `
+"Line: <p>@DateTime.Now</p>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 2 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, entity.name.tag.html
+ - token from 2 to 3 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.end.html
+ - token from 3 to 4 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 4 to 12 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 12 to 13 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 13 to 16 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 16 to 18 (</) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.begin.html
+ - token from 18 to 19 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, entity.name.tag.html
+ - token from 19 to 20 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Email address, not implicit expression 1`] = `
+"Line: abc@DateTime.Now
+ - token from 0 to 17 (abc@DateTime.Now) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Empty 1`] = `
+"Line: @
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Awaited method invocation 1`] = `
+"Line: <button @onclick="@await AsyncMethod()"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 38 (@await AsyncMethod()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 38 to 39 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 40 to 42 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 42 to 48 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Awaited property 1`] = `
+"Line: <button @onclick="@await AsyncProperty"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 38 (@await AsyncProperty) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 38 to 39 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 40 to 42 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 42 to 48 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Class implicit expression 1`] = `
+"Line: <div class="@NavMenuCssClass"></div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html
+ - token from 5 to 10 (class) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 11 to 12 (") with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 12 to 28 (@NavMenuCssClass) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.double.html
+ - token from 28 to 29 (") with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+ - token from 30 to 32 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 32 to 35 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Close curly prefix 1`] = `
+"Line: <button @onclick="}@DateTime.Now"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (}@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Close curly suffix 1`] = `
+"Line: <button @onclick="@DateTime.Now}"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now}) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Close parenthesis suffix 1`] = `
+"Line: <button @onclick="@DateTime.Now)"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now)) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Close parenthesis suffix 2`] = `
+"Line: <button @onclick="@DateTime.Now]"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now]) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Combined with HTML 1`] = `
+"Line: <button @onclick="<p>@DateTime.Now</p>"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 38 (<p>@DateTime.Now</p>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 38 to 39 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 40 to 42 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 42 to 48 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Email address, not implicit expression 1`] = `
+"Line: <button @onclick="abc@DateTime.Now"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 34 (abc@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 36 to 38 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 38 to 44 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 44 to 45 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Empty 1`] = `
+"Line: <button @onclick="@"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 19 (@) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 19 to 20 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 21 to 23 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 23 to 29 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Multi line 1`] = `
+"Line: <button @onclick="@DateTime!.Now()[1234 +
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 42 (@DateTime!.Now()[1234 +) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: 5678](
+ - token from 0 to 7 (5678]() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: abc()!.Current,
+ - token from 0 to 16 (abc()!.Current,) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: 1 + 2 + getValue())?.ToString[123](
+ - token from 0 to 36 (1 + 2 + getValue())?.ToString[123]() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: () =>
+ - token from 0 to 6 (() =>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: {
+ - token from 0 to 2 ({) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line:     var x = 123;
+ - token from 0 to 17 (    var x = 123;) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line:     var y = true;
+ - token from 0 to 18 (    var y = true;) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line:     return y ? x : 457;
+ - token from 0 to 24 (    return y ? x : 457;) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+
+Line: })"></button>
+ - token from 0 to 2 (})) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 2 to 3 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 3 to 4 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 6 to 12 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 12 to 13 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Onclick function name 1`] = `
+"Line: <button @onclick="ToggleNavMenu"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 31 (ToggleNavMenu) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 31 to 32 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 32 to 33 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 33 to 35 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 35 to 41 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 41 to 42 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Onclick implicit expression 1`] = `
+"Line: <button @onclick="@ToggleNavMenu()"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 34 (@ToggleNavMenu()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 36 to 38 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 38 to 44 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 44 to 45 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Open curly suffix 1`] = `
+"Line: <button @onclick="@DateTime.Now{"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now{) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Parenthesis prefix 1`] = `
+"Line: <button @onclick=")@DateTime.Now"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 ()@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Punctuation prefix 1`] = `
+"Line: <button @onclick=".@DateTime.Now"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (.@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 32 to 33 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Single line complex 1`] = `
+"Line: <button @onclick="@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 109 (@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 109 to 110 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 110 to 111 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 111 to 113 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 113 to 119 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 119 to 120 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Double Quotes Single line simple 1`] = `
+"Line: <button @onclick="@DateTime.Now"></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 31 (@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html
+ - token from 31 to 32 (") with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 32 to 33 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 33 to 35 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 35 to 41 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 41 to 42 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Awaited method invocation 1`] = `
+"Line: <button @onclick='@await AsyncMethod()'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 38 (@await AsyncMethod()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 38 to 39 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 40 to 42 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 42 to 48 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Awaited property 1`] = `
+"Line: <button @onclick='@await AsyncProperty'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 38 (@await AsyncProperty) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 38 to 39 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 40 to 42 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 42 to 48 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Class implicit expression 1`] = `
+"Line: <div class='@NavMenuCssClass'></div>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 4 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, entity.name.tag.html
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html
+ - token from 5 to 10 (class) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 11 to 12 (') with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 12 to 28 (@NavMenuCssClass) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.single.html
+ - token from 28 to 29 (') with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, meta.attribute.class.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.start.html, punctuation.definition.tag.end.html
+ - token from 30 to 32 (</) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.begin.html
+ - token from 32 to 35 (div) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.div.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Close curly prefix 1`] = `
+"Line: <button @onclick='}@DateTime.Now'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (}@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Close curly suffix 1`] = `
+"Line: <button @onclick='@DateTime.Now}'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now}) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Close parenthesis suffix 1`] = `
+"Line: <button @onclick='@DateTime.Now)'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now)) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Close parenthesis suffix 2`] = `
+"Line: <button @onclick='@DateTime.Now]'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now]) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Combined with HTML 1`] = `
+"Line: <button @onclick='<p>@DateTime.Now</p>'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 38 (<p>@DateTime.Now</p>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 38 to 39 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 40 to 42 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 42 to 48 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 48 to 49 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Email address, not implicit expression 1`] = `
+"Line: <button @onclick='abc@DateTime.Now'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 34 (abc@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 34 to 35 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 36 to 38 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 38 to 44 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 44 to 45 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Empty 1`] = `
+"Line: <button @onclick='@'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 19 (@) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 19 to 20 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 21 to 23 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 23 to 29 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Multi line 1`] = `
+"Line: <button @onclick='@DateTime!.Now()[1234 +
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 42 (@DateTime!.Now()[1234 +) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: 5678](
+ - token from 0 to 7 (5678]() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: abc()!.Current,
+ - token from 0 to 16 (abc()!.Current,) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: 1 + 2 + getValue())?.ToString[123](
+ - token from 0 to 36 (1 + 2 + getValue())?.ToString[123]() with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: () =>
+ - token from 0 to 6 (() =>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: {
+ - token from 0 to 2 ({) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:     var x = 123;
+ - token from 0 to 17 (    var x = 123;) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:     var y = true;
+ - token from 0 to 18 (    var y = true;) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line:     return y ? x : 457;
+ - token from 0 to 24 (    return y ? x : 457;) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+
+Line: })'></button>
+ - token from 0 to 2 (})) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 2 to 3 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 3 to 4 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 6 to 12 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 12 to 13 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Onclick function name 1`] = `
+"Line: <button @onclick='ToggleNavMenu'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 31 (ToggleNavMenu) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 31 to 32 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 32 to 33 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 33 to 35 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 35 to 41 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 41 to 42 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Onclick implicit expression 1`] = `
+"Line: <button @onclick='@ToggleNavMenu()'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 34 (@ToggleNavMenu()) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 34 to 35 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 36 to 38 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 38 to 44 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 44 to 45 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Open curly suffix 1`] = `
+"Line: <button @onclick='@DateTime.Now{'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (@DateTime.Now{) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Parenthesis prefix 1`] = `
+"Line: <button @onclick=')@DateTime.Now'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 ()@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Punctuation prefix 1`] = `
+"Line: <button @onclick='.@DateTime.Now'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 32 (.@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 32 to 33 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 33 to 34 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 34 to 36 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 36 to 42 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Single line complex 1`] = `
+"Line: <button @onclick='@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 109 (@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 109 to 110 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 110 to 111 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 111 to 113 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 113 to 119 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 119 to 120 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions In Attributes Single Quotes Single line simple 1`] = `
+"Line: <button @onclick='@DateTime.Now'></button>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, entity.name.tag.html
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html
+ - token from 8 to 16 (@onclick) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.begin.html
+ - token from 18 to 31 (@DateTime.Now) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html
+ - token from 31 to 32 (') with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, meta.attribute.unrecognized.@onclick.html, string.quoted.single.html, punctuation.definition.string.end.html
+ - token from 32 to 33 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.start.html, punctuation.definition.tag.end.html
+ - token from 33 to 35 (</) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.begin.html
+ - token from 35 to 41 (button) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, entity.name.tag.html
+ - token from 41 to 42 (>) with scopes text.aspnetcorerazor, meta.tag.structure.button.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Multi line 1`] = `
+"Line: @DateTime!.Now()[1234 +
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 11 (!.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 11 to 14 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 14 to 15 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 15 to 16 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 16 to 17 ([) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.open.cs
+ - token from 17 to 21 (1234) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, constant.numeric.decimal.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets
+ - token from 22 to 23 (+) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, keyword.operator.arithmetic.cs
+
+Line: 5678](
+ - token from 0 to 4 (5678) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, constant.numeric.decimal.cs
+ - token from 4 to 5 (]) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.close.cs
+ - token from 5 to 6 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+
+Line: abc()!.Current,
+ - token from 0 to 3 (abc) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.function.cs
+ - token from 3 to 4 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 4 to 5 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 5 to 6 (!) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.logical.cs
+ - token from 6 to 7 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.accessor.cs
+ - token from 7 to 14 (Current) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.object.property.cs
+ - token from 14 to 16 (,) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+
+Line: 1 + 2 + getValue())?.ToString[123](
+ - token from 0 to 1 (1) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 1 to 2 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 2 to 3 (+) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arithmetic.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 4 to 5 (2) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 6 to 7 (+) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arithmetic.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 8 to 16 (getValue) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.function.cs
+ - token from 16 to 17 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 17 to 18 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 18 to 19 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 19 to 21 (?.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 21 to 29 (ToString) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 29 to 30 ([) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.open.cs
+ - token from 30 to 33 (123) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, constant.numeric.decimal.cs
+ - token from 33 to 34 (]) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.close.cs
+ - token from 34 to 35 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+
+Line: () =>
+ - token from 0 to 1 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 3 to 5 (=>) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arrow.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.terminator.statement.cs
+
+Line:     var y = true;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 8 to 9 (y) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 12 to 16 (true) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.language.boolean.true.cs
+ - token from 16 to 17 (;) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.terminator.statement.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+
+Line:     return y ? x : 457;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 4 to 10 (return) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.control.flow.return.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 11 to 12 (y) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 13 to 14 (?) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.conditional.question-mark.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 15 to 16 (x) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 17 to 18 (:) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.conditional.colon.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 19 to 22 (457) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 22 to 23 (;) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.terminator.statement.cs
+
+Line: })
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.curlybrace.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Open curly suffix 1`] = `
+"Line: @DateTime.Now{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 10 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 10 to 13 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 13 to 15 ({) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Parenthesis prefix 1`] = `
+"Line: )@DateTime.Now
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor
+ - token from 1 to 2 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 2 to 10 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 10 to 11 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 11 to 14 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Punctuation prefix 1`] = `
+"Line: .@DateTime.Now
+ - token from 0 to 1 (.) with scopes text.aspnetcorerazor
+ - token from 1 to 2 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 2 to 10 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 10 to 11 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 11 to 14 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Single line complex 1`] = `
+"Line: @DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 11 (!.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 11 to 14 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 14 to 15 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 15 to 16 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 16 to 17 ([) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.open.cs
+ - token from 17 to 21 (1234) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, constant.numeric.decimal.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets
+ - token from 22 to 23 (+) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, keyword.operator.arithmetic.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets
+ - token from 24 to 28 (5678) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, constant.numeric.decimal.cs
+ - token from 28 to 29 (]) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.close.cs
+ - token from 29 to 30 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 30 to 33 (abc) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.function.cs
+ - token from 33 to 34 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 34 to 35 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 35 to 36 (!) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.logical.cs
+ - token from 36 to 37 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.accessor.cs
+ - token from 37 to 44 (Current) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.object.property.cs
+ - token from 44 to 46 (, ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 46 to 47 (1) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 47 to 48 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 48 to 49 (+) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arithmetic.cs
+ - token from 49 to 50 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 50 to 51 (2) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 52 to 53 (+) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arithmetic.cs
+ - token from 53 to 54 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 54 to 62 (getValue) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.function.cs
+ - token from 62 to 63 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 63 to 64 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 64 to 65 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 65 to 67 (?.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 67 to 75 (ToString) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 75 to 76 ([) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.open.cs
+ - token from 76 to 79 (123) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, constant.numeric.decimal.cs
+ - token from 79 to 80 (]) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.brackets, punctuation.squarebracket.close.cs
+ - token from 80 to 81 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 81 to 82 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 82 to 83 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 83 to 84 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 84 to 86 (=>) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arrow.cs
+ - token from 86 to 87 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 87 to 90 (456) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, constant.numeric.decimal.cs
+ - token from 90 to 91 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests Implicit Expressions Single line simple 1`] = `
+"Line: @DateTime.Now
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 9 (DateTime) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 9 to 10 (.) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs
+ - token from 10 to 13 (Now) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Complex HTML tag structures 1`] = `
+"Line: @{<p><input      /><strong>Hello <hr/> <br> World</strong></p>}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 3 to 4 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 5 to 6 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, punctuation.definition.tag.begin.html
+ - token from 6 to 11 (input) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, entity.name.tag.html
+ - token from 11 to 17 (      ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html
+ - token from 17 to 19 (/>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, punctuation.definition.tag.end.html
+ - token from 19 to 20 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 20 to 26 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 26 to 27 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 27 to 33 (Hello ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 33 to 34 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.hr.void.html, punctuation.definition.tag.begin.html
+ - token from 34 to 36 (hr) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.hr.void.html, entity.name.tag.html
+ - token from 36 to 38 (/>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.hr.void.html, punctuation.definition.tag.end.html
+ - token from 38 to 39 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 39 to 40 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.br.void.html, punctuation.definition.tag.begin.html
+ - token from 40 to 42 (br) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.br.void.html, entity.name.tag.html
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.br.void.html, punctuation.definition.tag.end.html
+ - token from 43 to 49 ( World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 49 to 51 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 51 to 57 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 57 to 58 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 58 to 60 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 60 to 61 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 61 to 62 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 62 to 63 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Complex with various nested statements 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     if (true) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 4 to 6 (if) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 12 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 12 to 13 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <div>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 12 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 12 to 13 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @using (someDisposable) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.control.cshtml.transition
+ - token from 9 to 14 (using) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.other.using.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 30 (someDisposable) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 30 to 31 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 31 to 32 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 32 to 33 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p>Foo!</p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 19 (Foo!) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 19 to 21 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 21 to 22 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:             var x = 123;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 16 to 17 (x) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 18 to 19 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 23 (123) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:             while (i++ % 2 == 0)
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 12 to 17 (while) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 18 to 19 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 19 to 20 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.increment.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 23 to 24 (%) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.arithmetic.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 25 to 26 (2) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 27 to 29 (==) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.comparison.cs
+ - token from 29 to 30 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 30 to 31 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 31 to 32 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+
+Line:             {
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:                 <strong>Bar</strong>
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 16 to 17 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 23 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 23 to 24 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 24 to 27 (Bar) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 27 to 29 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 29 to 35 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:             }
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:         </div>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 10 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 10 to 13 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 13 to 14 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Empty code block 1`] = `
+"Line: @{}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Incomplete code block 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Malformed code block 1`] = `
+"Line: @ {}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 5 ( {}) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Multi line complex 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     var x = true;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 16 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.language.boolean.true.cs
+ - token from 16 to 17 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     <text>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 10 (<text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.open
+
+Line:         @{
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 9 to 10 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:             @DateTime.Now
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 13 to 21 (DateTime) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 21 to 22 (.) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs
+ - token from 22 to 25 (Now) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+
+Line:             @{
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 13 to 14 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:                 @{
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 16 to 17 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 17 to 18 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+
+Line:                 }
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 16 to 17 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+
+Line:             }
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+
+Line:     </text>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 11 (</text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.close
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:     <p></p>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 5 to 6 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 6 to 7 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 7 to 9 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line: <p class="hello <world></p>" @DateTime.Now> Foo<strong @{ <text> can't believe this works </text>}>Bar</strong> Baz
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 1 to 2 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 8 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 8 to 9 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 9 to 10 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 10 to 27 (hello <world></p>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, string.quoted.double.html
+ - token from 27 to 28 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 29 to 30 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 30 to 38 (DateTime) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 38 to 39 (.) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs
+ - token from 39 to 42 (Now) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 43 to 47 ( Foo) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 47 to 48 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 48 to 54 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 54 to 55 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 55 to 56 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 56 to 57 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 57 to 58 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 58 to 64 (<text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.open
+ - token from 64 to 90 ( can't believe this works ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs
+ - token from 90 to 97 (</text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.close
+ - token from 97 to 98 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+ - token from 98 to 99 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 99 to 102 (Bar) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 102 to 104 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 104 to 110 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 110 to 111 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 111 to 116 ( Baz) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:         <p class="hello world">
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 11 to 16 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 29 (hello world) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, string.quoted.double.html
+ - token from 29 to 30 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 30 to 31 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line:             Below is an incomplete tag
+ - token from 0 to 39 (            Below is an incomplete tag) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:             </strong>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 20 (</strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line:         </p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 10 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 10 to 11 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 11 to 12 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:         <text>This is not a special transition tag</text>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 9 to 13 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 13 to 14 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 14 to 50 (This is not a special transition tag) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 50 to 52 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 52 to 56 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 56 to 57 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line:         Hello World
+ - token from 0 to 20 (        Hello World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:     </p>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 6 to 7 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line:     @: <strong> <-- This is incomplete @DateTime.Now
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 6 (@:) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.razor.singleLineMarkup
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 7 to 8 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.inline.strong.start.html, punctuation.definition.tag.begin.html
+ - token from 8 to 14 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.inline.strong.start.html, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.inline.strong.start.html, punctuation.definition.tag.end.html
+ - token from 15 to 39 ( <-- This is incomplete ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 39 to 40 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 40 to 48 (DateTime) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 48 to 49 (.) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs
+ - token from 49 to 52 (Now) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:     <input class="hello world">
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, punctuation.definition.tag.begin.html
+ - token from 5 to 10 (input) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, entity.name.tag.html
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html
+ - token from 11 to 16 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 18 to 29 (hello world) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, meta.attribute.class.html, string.quoted.double.html
+ - token from 29 to 30 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 30 to 31 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, punctuation.definition.tag.end.html
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:     void SomeMethod(int value)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 8 (void) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 9 to 19 (SomeMethod) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.function.cs
+ - token from 19 to 20 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 20 to 23 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 24 to 29 (value) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.parameter.cs
+ - token from 29 to 30 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<strong>Value: @item</strong>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 33 to 39 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 40 to 45 (Value) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 45 to 47 (: ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 47 to 52 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 52 to 53 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 53 to 54 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 54 to 60 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 60 to 61 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 61 to 62 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         <section>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 9 to 16 (section) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+
+Line:             This section is rendered when called: @template(1337)
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 16 (This) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 17 to 24 (section) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 25 to 27 (is) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.is.cs
+ - token from 27 to 28 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 28 to 36 (rendered) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.type.cs
+ - token from 36 to 37 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 37 to 41 (when) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 41 to 42 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 42 to 48 (called) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.label.cs
+ - token from 48 to 49 (:) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.separator.colon.cs
+ - token from 49 to 50 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 50 to 59 (@template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.function.cs
+ - token from 59 to 60 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 60 to 64 (1337) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 64 to 65 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:         </section>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 9 to 10 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 10 to 17 (section) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 17 to 18 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:     <p>aHello</p>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 5 to 6 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 6 to 7 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 7 to 13 (aHello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 13 to 15 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 15 to 16 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line:     if (true) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 4 to 6 (if) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 12 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 12 to 13 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>alksdjfl</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 19 (alksdjfl) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 19 to 21 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 21 to 22 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested do while statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     var i = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 13 to 14 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     do
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor
+ - token from 4 to 6 (do) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, keyword.control.loop.do.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>@i</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 12 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 12 to 13 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 13 to 15 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 15 to 16 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     } while (i++ != 10);
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 6 to 11 (while) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 14 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 14 to 16 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.increment.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 17 to 19 (!=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.comparison.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 20 to 22 (10) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 22 to 23 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.terminator.statement.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested for statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     for (var i = 0; i % 2 == 0; i++)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 4 to 7 (for) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 12 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.other.var.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 13 to 14 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, entity.name.variable.local.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 15 to 16 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 17 to 18 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 18 to 19 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 20 to 21 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 22 to 23 (%) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.arithmetic.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 24 to 25 (2) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 26 to 28 (==) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.comparison.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 29 to 30 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 30 to 31 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 31 to 32 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 32 to 33 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 33 to 35 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.increment.cs
+ - token from 35 to 36 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>@i</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 12 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 12 to 13 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 13 to 15 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 15 to 16 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested foreach statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     foreach (var person in people)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 4 to 11 (foreach) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 16 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, keyword.other.var.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 17 to 23 (person) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 24 to 26 (in) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 27 to 33 (people) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>@person</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 12 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 12 to 18 (person) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 18 to 20 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 20 to 21 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested if statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     if (true)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 4 to 6 (if) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 12 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 12 to 13 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>Hello World!</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 23 (Hello World!) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 23 to 25 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 25 to 26 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 26 to 27 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested local function with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     void SomeMethod() { <p class="priority"><strong>Hello World</strong></p> }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 8 (void) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 9 to 19 (SomeMethod) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.function.cs
+ - token from 19 to 20 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 22 to 23 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 24 to 25 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 25 to 26 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.type.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 27 to 32 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 32 to 33 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 33 to 34 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 34 to 42 (priority) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs
+ - token from 42 to 43 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 44 to 45 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 45 to 51 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 51 to 52 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 52 to 57 (Hello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 57 to 58 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 58 to 63 (World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 63 to 64 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 64 to 65 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 65 to 71 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 71 to 72 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 72 to 73 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 73 to 74 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 74 to 75 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 75 to 76 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 76 to 77 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 77 to 79 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line: }
+ - token from 0 to 2 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested lock statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     lock (someObject)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor
+ - token from 4 to 8 (lock) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 10 to 20 (someObject) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, variable.other.readwrite.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>Hello World</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 22 (Hello World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 22 to 24 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 24 to 25 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 25 to 26 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested switch statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     switch (something)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor
+ - token from 4 to 10 (switch) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor
+ - token from 11 to 12 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 12 to 21 (something) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 21 to 22 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+
+Line:         case true:
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 12 (case) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.case.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 13 to 17 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.language.boolean.true.cs
+ - token from 17 to 18 (:) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.separator.colon.cs
+
+Line:             <p>Hello World</p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+ - token from 15 to 26 (Hello World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 26 to 28 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.begin.html
+ - token from 28 to 29 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.tag.html
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.tag.end.html
+
+Line:             break;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 17 (break) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.flow.break.cs
+ - token from 17 to 18 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested text tag 1`] = `
+"Line: @{ <p><text>Hello</text></p> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 4 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 4 to 5 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 6 to 7 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 7 to 11 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 11 to 12 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 12 to 17 (Hello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 17 to 19 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 19 to 23 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 23 to 24 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 24 to 26 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 26 to 27 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 27 to 28 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 29 to 30 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested text text tag 1`] = `
+"Line: @{ <text><text>Hello</text></text> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 9 (<text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.open
+ - token from 9 to 10 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 10 to 14 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 15 to 20 (Hello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 20 to 22 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 22 to 26 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 26 to 27 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 27 to 34 (</text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.close
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 35 to 36 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested try statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     try
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor
+ - token from 4 to 7 (try) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, keyword.control.try.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>Hello World</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 22 (Hello World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 22 to 24 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 24 to 25 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 25 to 26 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     } catch (Exception ex){}
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor
+ - token from 6 to 11 (catch) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 22 (Exception) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, entity.name.type.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor
+ - token from 23 to 25 (ex) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, entity.name.variable.local.cs
+ - token from 25 to 26 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 26 to 27 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 27 to 28 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested using statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     using (someDisposable)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor
+ - token from 4 to 9 (using) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, keyword.other.using.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor
+ - token from 10 to 11 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 11 to 25 (someDisposable) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 25 to 26 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>Hello World</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 22 (Hello World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 22 to 24 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 24 to 25 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 25 to 26 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Nested while statement with markup 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     var i = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 13 to 14 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     while (i++ != 10)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 4 to 9 (while) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 10 to 11 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 11 to 12 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 12 to 14 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.increment.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 15 to 17 (!=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.comparison.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 18 to 20 (10) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <p>@i</p>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 10 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 10 to 11 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 11 to 12 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 12 to 13 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 13 to 15 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 15 to 16 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Pure C# 1`] = `
+"Line: @{var x = true; Console.WriteLine("Hello World");}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 5 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.var.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 6 to 7 (x) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 10 to 14 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.language.boolean.true.cs
+ - token from 14 to 15 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 16 to 23 (Console) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.object.cs
+ - token from 23 to 24 (.) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.accessor.cs
+ - token from 24 to 33 (WriteLine) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.function.cs
+ - token from 33 to 34 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 35 to 46 (Hello World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs
+ - token from 46 to 47 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 47 to 48 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 48 to 49 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 49 to 50 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Self-closing component 1`] = `
+"Line: @{ <SurveyPrompt /> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 4 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 4 to 16 (SurveyPrompt) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 17 to 19 (/>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 20 to 21 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Single line local function 1`] = `
+"Line: @{ void Foo() {} }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 7 (void) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 11 (Foo) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.function.cs
+ - token from 11 to 12 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 12 to 13 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.parenthesis.close.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 15 to 16 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.close.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 17 to 18 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Single line markup complex 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     @:@DateTime.Now <text>Nope</text>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 6 (@:) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.razor.singleLineMarkup
+ - token from 6 to 7 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 7 to 15 (DateTime) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.cs
+ - token from 15 to 16 (.) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs
+ - token from 16 to 19 (Now) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, source.cs, variable.other.object.property.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 20 to 21 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.other.text.html, punctuation.definition.tag.begin.html
+ - token from 21 to 25 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.other.text.html, entity.name.tag.html, invalid.illegal.unrecognized-tag.html
+ - token from 25 to 26 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.other.text.html, punctuation.definition.tag.end.html
+ - token from 26 to 30 (Nope) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 30 to 32 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.other.text.html, punctuation.definition.tag.begin.html
+ - token from 32 to 36 (text) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.other.text.html, entity.name.tag.html, invalid.illegal.unrecognized-tag.html
+ - token from 36 to 37 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.other.text.html, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Single line markup simple 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     @: <p> Incomplete
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 6 (@:) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.razor.singleLineMarkup
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 7 to 8 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.p.start.html, punctuation.definition.tag.begin.html
+ - token from 8 to 9 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.p.start.html, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.p.start.html, punctuation.definition.tag.end.html
+ - token from 10 to 22 ( Incomplete) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor code blocks @{ ... } Top level text tag 1`] = `
+"Line: @{ <text>Hello</text> }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 9 (<text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.open
+ - token from 9 to 14 (Hello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 14 to 21 (</text>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.control.cshtml.transition.textTag.close
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 22 to 23 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor comment Empty 1`] = `
+"Line: @**@
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+ - token from 1 to 2 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 2 to 3 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 3 to 4 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+"
+`;
+
+exports[`Grammar tests Razor comment Multiple line 1`] = `
+"Line: @* Hello, this is a
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+ - token from 1 to 2 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 2 to 20 ( Hello, this is a) with scopes text.aspnetcorerazor, meta.comment.razor, comment.block.razor
+
+Line: multiline Razor comment. *@
+ - token from 0 to 25 (multiline Razor comment. ) with scopes text.aspnetcorerazor, meta.comment.razor, comment.block.razor
+ - token from 25 to 26 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 26 to 27 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+"
+`;
+
+exports[`Grammar tests Razor comment Nested 1`] = `
+"Line: @* Hello @* World *@ *@
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+ - token from 1 to 2 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 2 to 18 ( Hello @* World ) with scopes text.aspnetcorerazor, meta.comment.razor, comment.block.razor
+ - token from 18 to 19 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 19 to 20 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+ - token from 20 to 22 ( *) with scopes text.aspnetcorerazor
+ - token from 22 to 23 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+"
+`;
+
+exports[`Grammar tests Razor comment Single line 1`] = `
+"Line: @* Hello *@
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+ - token from 1 to 2 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 2 to 9 ( Hello ) with scopes text.aspnetcorerazor, meta.comment.razor, comment.block.razor
+ - token from 9 to 10 (*) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.razor.comment.star
+ - token from 10 to 11 (@) with scopes text.aspnetcorerazor, meta.comment.razor, keyword.control.cshtml.transition
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Complex HTML tag structure non-template 1`] = `
+"Line: @{@<p><input      /><strong>Hello <hr/> <br> World</strong></p>}
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 3 to 4 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 4 to 5 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 5 to 6 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 6 to 7 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, punctuation.definition.tag.begin.html
+ - token from 7 to 12 (input) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, entity.name.tag.html
+ - token from 12 to 18 (      ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html
+ - token from 18 to 20 (/>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.input.void.html, punctuation.definition.tag.end.html
+ - token from 20 to 21 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 21 to 27 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 27 to 28 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 28 to 34 (Hello ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 34 to 35 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.hr.void.html, punctuation.definition.tag.begin.html
+ - token from 35 to 37 (hr) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.hr.void.html, entity.name.tag.html
+ - token from 37 to 39 (/>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.hr.void.html, punctuation.definition.tag.end.html
+ - token from 39 to 40 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.br.void.html, punctuation.definition.tag.begin.html
+ - token from 41 to 43 (br) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.br.void.html, entity.name.tag.html
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.tag.structure.br.void.html, punctuation.definition.tag.end.html
+ - token from 44 to 50 ( World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 50 to 52 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 52 to 58 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 58 to 59 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 59 to 61 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.begin.html
+ - token from 61 to 62 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.tag.html
+ - token from 62 to 63 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.tag.end.html
+ - token from 63 to 64 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Complex with various nested statements 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     if (true) {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 4 to 6 (if) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 7 to 8 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 8 to 12 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 12 to 13 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor
+ - token from 14 to 15 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         <div>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 9 to 12 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 12 to 13 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @using (someDisposable) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.control.cshtml.transition
+ - token from 9 to 14 (using) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, keyword.other.using.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 16 to 30 (someDisposable) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 30 to 31 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, punctuation.parenthesis.close.cs
+ - token from 31 to 32 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor
+ - token from 32 to 33 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p>Foo!</p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 19 (Foo!) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 19 to 21 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 21 to 22 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:             var x = 123;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 16 to 17 (x) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 18 to 19 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 23 (123) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:             while (i++ % 2 == 0)
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 12 to 17 (while) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 18 to 19 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 19 to 20 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 20 to 22 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.increment.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 23 to 24 (%) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.arithmetic.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 25 to 26 (2) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 27 to 29 (==) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, keyword.operator.comparison.cs
+ - token from 29 to 30 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 30 to 31 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 31 to 32 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, punctuation.parenthesis.close.cs
+
+Line:             {
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:                 Action<int> template = @<p>
+ - token from 0 to 16 (                ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 16 to 22 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 22 to 23 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 23 to 26 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 26 to 27 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 27 to 28 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 28 to 36 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 36 to 37 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 37 to 38 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 38 to 40 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 42 to 43 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+
+Line:                     @item
+ - token from 0 to 20 (                    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 25 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+
+Line: 
+ - token from 0 to 1 () with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+
+Line:                     @{
+ - token from 0 to 21 (                    @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 21 to 22 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:                         Action anotherTemplate = @<strong class='really loud!'>LOUD</strong>;
+ - token from 0 to 24 (                        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 24 to 30 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 30 to 31 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 31 to 46 (anotherTemplate) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 46 to 47 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 47 to 48 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 48 to 50 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 50 to 51 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 51 to 57 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 57 to 58 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 58 to 63 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 63 to 64 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 64 to 65 (') with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, string.quoted.single.cs, punctuation.definition.char.begin.cs
+ - token from 65 to 77 (really loud!) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, string.quoted.single.cs
+ - token from 77 to 78 (') with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, string.quoted.single.cs, punctuation.definition.char.end.cs
+ - token from 78 to 79 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 79 to 83 (LOUD) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 83 to 84 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 84 to 85 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 85 to 91 (strong) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 91 to 92 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 92 to 94 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+
+Line:                     }
+ - token from 0 to 20 (                    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 21 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:                     </p>;
+ - token from 0 to 20 (                    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 21 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 21 to 22 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 22 to 23 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 23 to 24 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 24 to 25 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:             }
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:         </div>
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 10 (</) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 10 to 13 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 13 to 14 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Empty 1`] = `
+"Line: @<p></p>
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (<) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.begin.html
+ - token from 2 to 3 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, entity.name.tag.html
+ - token from 3 to 4 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.end.html
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.begin.html
+ - token from 6 to 7 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, entity.name.tag.html
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Incomplete 1`] = `
+"Line: @<strong>
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (<) with scopes text.aspnetcorerazor, meta.tag.inline.strong.start.html, punctuation.definition.tag.begin.html
+ - token from 2 to 8 (strong) with scopes text.aspnetcorerazor, meta.tag.inline.strong.start.html, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.tag.inline.strong.start.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Malformed 1`] = `
+"Line: @ <p></p>
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 ( ) with scopes text.aspnetcorerazor
+ - token from 2 to 3 (<) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.begin.html
+ - token from 3 to 4 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.end.html
+ - token from 5 to 7 (</) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.begin.html
+ - token from 7 to 8 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Malformed attributes 1`] = `
+"Line: @<p class="></p>
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (<) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.begin.html
+ - token from 2 to 3 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, entity.name.tag.html
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html
+ - token from 4 to 9 (class) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 9 to 10 (=) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 10 to 11 (") with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 11 to 17 (></p>) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, meta.attribute.class.html, string.quoted.double.html
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested do while statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     var i = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 13 to 14 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     do
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor
+ - token from 4 to 6 (do) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, keyword.control.loop.do.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         @template(i)
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 9 to 17 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 18 to 19 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+
+Line:     } while (i++ != 10);
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.do.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 6 to 11 (while) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 14 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 14 to 16 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.increment.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 17 to 19 (!=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.comparison.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 20 to 22 (10) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 22 to 23 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.close.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.terminator.statement.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested for statement with templates 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     for (var i = 0; i % 2 == 0; i++)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 4 to 7 (for) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.control.loop.for.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 12 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.other.var.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 13 to 14 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, entity.name.variable.local.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 15 to 16 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.assignment.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 17 to 18 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 18 to 19 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 20 to 21 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 22 to 23 (%) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.arithmetic.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 24 to 25 (2) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 25 to 26 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 26 to 28 (==) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.comparison.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 29 to 30 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, constant.numeric.decimal.cs
+ - token from 30 to 31 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.terminator.statement.cs
+ - token from 31 to 32 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 32 to 33 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, variable.other.readwrite.cs
+ - token from 33 to 35 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, keyword.operator.increment.cs
+ - token from 35 to 36 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         @template(i)
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 9 to 17 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 18 to 19 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.for.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested foreach statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     foreach (var person in people)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 4 to 11 (foreach) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, keyword.control.loop.foreach.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 16 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, keyword.other.var.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 17 to 23 (person) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, entity.name.variable.local.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 24 to 26 (in) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, keyword.control.loop.in.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 27 to 33 (people) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, variable.other.readwrite.cs
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         @template(i)
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 9 to 17 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 18 to 19 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.foreach.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested lock statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     lock (someObject)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor
+ - token from 4 to 8 (lock) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, keyword.other.lock.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor
+ - token from 9 to 10 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, punctuation.parenthesis.open.cs
+ - token from 10 to 20 (someObject) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, variable.other.readwrite.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<string> template = @<p class="world">@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 21 (string) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 23 to 31 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 31 to 32 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 33 to 35 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 35 to 36 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 36 to 37 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 37 to 38 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 38 to 43 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 44 to 45 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 45 to 50 (world) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, string.quoted.double.cs
+ - token from 50 to 51 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 51 to 52 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 52 to 57 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 57 to 58 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 58 to 59 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 59 to 60 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 60 to 61 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 61 to 62 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         @template(someObject.ToString())
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 9 to 17 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 18 to 28 (someObject) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.object.cs
+ - token from 28 to 29 (.) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.accessor.cs
+ - token from 29 to 37 (ToString) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.function.cs
+ - token from 37 to 38 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 38 to 39 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+ - token from 39 to 40 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.lock.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested switch statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     switch (something)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor
+ - token from 4 to 10 (switch) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, keyword.control.switch.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor
+ - token from 11 to 12 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, punctuation.parenthesis.open.cs
+ - token from 12 to 21 (something) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, variable.other.readwrite.cs
+ - token from 21 to 22 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.open.cs
+
+Line:         case true:
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 8 to 12 (case) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.case.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 13 to 17 (true) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, constant.language.boolean.true.cs
+ - token from 17 to 18 (:) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.separator.colon.cs
+
+Line:             Action<int> template = @<p>@item</p>;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 18 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.type.cs
+ - token from 18 to 19 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.typeparameters.begin.cs
+ - token from 19 to 22 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.type.cs
+ - token from 22 to 23 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.definition.typeparameters.end.cs
+ - token from 23 to 24 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 24 to 32 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, entity.name.variable.local.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 33 to 34 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.assignment.cs
+ - token from 34 to 36 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 36 to 37 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.relational.cs
+ - token from 37 to 38 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, variable.other.readwrite.cs
+ - token from 38 to 39 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.relational.cs
+ - token from 39 to 44 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, variable.other.readwrite.cs
+ - token from 44 to 45 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.relational.cs
+ - token from 45 to 46 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.arithmetic.cs
+ - token from 46 to 47 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, variable.other.readwrite.cs
+ - token from 47 to 48 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.operator.relational.cs
+ - token from 48 to 49 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line:             break;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 12 to 17 (break) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, keyword.control.flow.break.cs
+ - token from 17 to 18 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.switch.razor, meta.structure.razor.csharp.codeblock.switch, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested template 1`] = `
+"Line: @{ Action<object> abc = @<div>@{ Action<object> def = @<p class="john" onclick='someMethod'>Hello World</p>; }</div>; }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 9 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.type.cs
+ - token from 9 to 10 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 10 to 16 (object) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 18 to 21 (abc) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 22 to 23 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 23 to 25 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 25 to 26 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 26 to 29 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 30 to 31 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 31 to 32 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.open.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 33 to 39 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 39 to 40 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 40 to 46 (object) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 46 to 47 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 47 to 48 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 48 to 51 (def) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 51 to 52 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 52 to 53 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 53 to 55 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 55 to 56 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 56 to 57 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 57 to 58 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 58 to 63 (class) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 63 to 64 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 64 to 65 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 65 to 69 (john) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs
+ - token from 69 to 70 (") with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 70 to 71 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 71 to 78 (onclick) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 78 to 79 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 79 to 80 (') with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.single.cs, punctuation.definition.char.begin.cs
+ - token from 80 to 90 (someMethod) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.single.cs
+ - token from 90 to 91 (') with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, string.quoted.single.cs, punctuation.definition.char.end.cs
+ - token from 91 to 92 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 92 to 97 (Hello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 97 to 98 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 98 to 103 (World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 103 to 104 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 104 to 105 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 105 to 106 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 106 to 107 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 107 to 109 (; ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 109 to 110 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.curlybrace.close.cs
+ - token from 110 to 111 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 111 to 112 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 112 to 115 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 115 to 116 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 116 to 117 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 117 to 118 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 118 to 119 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested template in @code directive 1`] = `
+"Line: @code {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 5 (code) with scopes text.aspnetcorerazor, keyword.control.razor.directive.code
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor
+ - token from 6 to 7 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     public Action<int> GetTemplate()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 10 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 11 to 17 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 17 to 18 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 18 to 21 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 34 (GetTemplate) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 34 to 35 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 35 to 36 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         return template;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 14 (return) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.control.flow.return.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 15 to 23 (template) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested template in @functions directive 1`] = `
+"Line: @functions {
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, keyword.control.cshtml.transition
+ - token from 1 to 10 (functions) with scopes text.aspnetcorerazor, keyword.control.razor.directive.functions
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor
+ - token from 11 to 12 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     public Action<int> GetTemplate()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 10 (public) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, storage.modifier.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 11 to 17 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 17 to 18 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 18 to 21 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 23 to 34 (GetTemplate) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.function.cs
+ - token from 34 to 35 (() with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.open.cs
+ - token from 35 to 36 ()) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:         return template;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 8 to 14 (return) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, keyword.control.flow.return.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 15 to 23 (template) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, source.cs, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.directive.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested template in explicit expression 1`] = `
+"Line: @(CallSomeMethod(@<p>
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+ - token from 2 to 16 (CallSomeMethod) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, entity.name.function.cs
+ - token from 16 to 17 (() with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.open.cs
+ - token from 17 to 18 (@) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 18 to 19 (<) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.relational.cs
+ - token from 19 to 20 (p) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+ - token from 20 to 21 (>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.relational.cs
+
+Line:     The Template
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 4 to 7 (The) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml
+ - token from 8 to 16 (Template) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+
+Line: </p>))
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.relational.cs
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.arithmetic.cs
+ - token from 2 to 3 (p) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, variable.other.readwrite.cs
+ - token from 3 to 4 (>) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.operator.relational.cs
+ - token from 4 to 5 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, punctuation.parenthesis.close.cs
+ - token from 5 to 6 ()) with scopes text.aspnetcorerazor, meta.expression.explicit.cshtml, keyword.control.cshtml
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested template in implicit expression 1`] = `
+"Line: @CallSomeMethod(@<p style="margin:1px;">
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 15 (CallSomeMethod) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 15 to 16 (() with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 16 to 17 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 17 to 18 (<) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.relational.cs
+ - token from 18 to 19 (p) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.type.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 20 to 25 (style) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, entity.name.variable.local.cs
+ - token from 25 to 26 (=) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.assignment.cs
+ - token from 26 to 27 (") with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 27 to 38 (margin:1px;) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, string.quoted.double.cs
+ - token from 38 to 39 (") with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 39 to 40 (>) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.relational.cs
+
+Line:     The Template
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 4 to 7 (The) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis
+ - token from 8 to 16 (Template) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+
+Line: </p>)
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.relational.cs
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.arithmetic.cs
+ - token from 2 to 3 (p) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 3 to 4 (>) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, keyword.operator.relational.cs
+ - token from 4 to 5 ()) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested try statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     try
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor
+ - token from 4 to 7 (try) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, keyword.control.try.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     } catch (Exception ex){}
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.try.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 5 to 6 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor
+ - token from 6 to 11 (catch) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, keyword.control.try.catch.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 22 (Exception) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, entity.name.type.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor
+ - token from 23 to 25 (ex) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, entity.name.variable.local.cs
+ - token from 25 to 26 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, punctuation.parenthesis.close.cs
+ - token from 26 to 27 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 27 to 28 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.catch.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested using statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     using (someDisposable)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor
+ - token from 4 to 9 (using) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, keyword.other.using.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor
+ - token from 10 to 11 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, punctuation.parenthesis.open.cs
+ - token from 11 to 25 (someDisposable) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, variable.other.readwrite.cs
+ - token from 25 to 26 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.using.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Nested while statement with template 1`] = `
+"Line: @{
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+
+Line:     var i = 0;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 8 to 9 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 12 to 13 (0) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, constant.numeric.decimal.cs
+ - token from 13 to 14 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+
+Line:     while (i++ != 10)
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 4 to 9 (while) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.control.loop.while.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 10 to 11 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.open.cs
+ - token from 11 to 12 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, variable.other.readwrite.cs
+ - token from 12 to 14 (++) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.increment.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 15 to 17 (!=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, keyword.operator.comparison.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 18 to 20 (10) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, constant.numeric.decimal.cs
+ - token from 20 to 21 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, punctuation.parenthesis.close.cs
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:         Action<int> template = @<p>@item</p>;
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 14 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.type.cs
+ - token from 14 to 15 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.begin.cs
+ - token from 15 to 18 (int) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.type.cs
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.typeparameters.end.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 28 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 28 to 29 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 29 to 30 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 30 to 32 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 32 to 33 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 33 to 34 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 35 to 40 (@item) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 40 to 41 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 41 to 42 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.arithmetic.cs
+ - token from 42 to 43 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, variable.other.readwrite.cs
+ - token from 43 to 44 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, keyword.operator.relational.cs
+ - token from 44 to 45 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         @template(i)
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 9 to 17 (template) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, entity.name.function.cs
+ - token from 17 to 18 (() with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.open.cs
+ - token from 18 to 19 (i) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, variable.other.readwrite.cs
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, meta.expression.implicit.cshtml, source.cs, razor.test.balanced.parenthesis, punctuation.parenthesis.close.cs
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, meta.statement.while.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Self-closing 1`] = `
+"Line: @<hr class="stuff" />
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (<) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, punctuation.definition.tag.begin.html
+ - token from 2 to 4 (hr) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, entity.name.tag.html
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html
+ - token from 5 to 10 (class) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, meta.attribute.class.html, entity.other.attribute-name.html
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, meta.attribute.class.html, punctuation.separator.key-value.html
+ - token from 11 to 12 (") with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.begin.html
+ - token from 12 to 17 (stuff) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, meta.attribute.class.html, string.quoted.double.html
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, meta.attribute.class.html, string.quoted.double.html, punctuation.definition.string.end.html
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html
+ - token from 19 to 21 (/>) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Single line local variable 1`] = `
+"Line: @{ Action<object> abc = @<div>Hello World</p>; }
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.cshtml.transition
+ - token from 1 to 2 ({) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.open
+ - token from 2 to 3 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 3 to 9 (Action) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.type.cs
+ - token from 9 to 10 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.typeparameters.begin.cs
+ - token from 10 to 16 (object) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.type.cs
+ - token from 16 to 17 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.definition.typeparameters.end.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 18 to 21 (abc) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, entity.name.variable.local.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 22 to 23 (=) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.assignment.cs
+ - token from 23 to 25 ( @) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 25 to 26 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 26 to 29 (div) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 29 to 30 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 30 to 35 (Hello) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 35 to 36 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 36 to 41 (World) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 41 to 42 (<) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 42 to 43 (/) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.arithmetic.cs
+ - token from 43 to 44 (p) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, variable.other.readwrite.cs
+ - token from 44 to 45 (>) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, keyword.operator.relational.cs
+ - token from 45 to 46 (;) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs, punctuation.terminator.statement.cs
+ - token from 46 to 47 ( ) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, source.cs
+ - token from 47 to 48 (}) with scopes text.aspnetcorerazor, meta.structure.razor.codeblock, keyword.control.razor.directive.codeblock.close
+"
+`;
+
+exports[`Grammar tests Razor templates @<p>....</p> Void 1`] = `
+"Line: @<hr>
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.expression.implicit.cshtml, keyword.control.cshtml.transition
+ - token from 1 to 2 (<) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, punctuation.definition.tag.begin.html
+ - token from 2 to 4 (hr) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, entity.name.tag.html
+ - token from 4 to 5 (>) with scopes text.aspnetcorerazor, meta.tag.structure.hr.void.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests Transitions Escaped transitions 1`] = `
+"Line: @@
+ - token from 0 to 2 (@@) with scopes text.aspnetcorerazor, constant.character.escape.razor.transition
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Else integrates with @if, complex 1`] = `
+"Line: @if (1 + 1 == 2)
+ - token from 0 to 1 (@) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 1 to 3 (if) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 3 to 4 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 4 to 5 (() with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 5 to 6 (1) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.numeric.decimal.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 7 to 8 (+) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.operator.arithmetic.cs
+ - token from 8 to 9 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 9 to 10 (1) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.numeric.decimal.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 11 to 13 (==) with scopes text.aspnetcorerazor, meta.statement.if.razor, keyword.operator.comparison.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.if.razor
+ - token from 14 to 15 (2) with scopes text.aspnetcorerazor, meta.statement.if.razor, constant.numeric.decimal.cs
+ - token from 15 to 16 ()) with scopes text.aspnetcorerazor, meta.statement.if.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     <p>If else!</p>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 6 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 6 to 7 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 7 to 15 (If else!) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: } else
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 1 to 2 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 2 to 6 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @if (true) {} else if (false) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 9 to 11 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 17 (true) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, constant.language.boolean.true.cs
+ - token from 17 to 18 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 19 to 20 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 20 to 21 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+ - token from 21 to 22 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor
+ - token from 22 to 26 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 26 to 27 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor
+ - token from 27 to 29 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, keyword.control.conditional.if.cs
+ - token from 29 to 30 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor
+ - token from 30 to 31 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, punctuation.parenthesis.open.cs
+ - token from 31 to 36 (false) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, constant.language.boolean.false.cs
+ - token from 36 to 37 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, punctuation.parenthesis.close.cs
+ - token from 37 to 38 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor
+ - token from 38 to 39 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <strong> Woa! </strong>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 19 (strong) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 19 to 20 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 20 to 26 ( Woa! ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 26 to 28 (</) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 28 to 34 (strong) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 34 to 35 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:             var y = 456;
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (var) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 16 to 17 (y) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 18 to 19 (=) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 19 to 20 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 20 to 23 (456) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Incomplete else if part, no condition 1`] = `
+"Line: else if {}
+ - token from 0 to 4 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 5 to 7 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.if.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 9 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 9 to 10 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Incomplete else, no condition or body 1`] = `
+"Line: else
+ - token from 0 to 4 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Invalid else part 1`] = `
+"Line: <p> else if (shouldNotBeElse) {}</p>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 2 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, entity.name.tag.html
+ - token from 2 to 3 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.start.html, punctuation.definition.tag.end.html
+ - token from 3 to 32 ( else if (shouldNotBeElse) {}) with scopes text.aspnetcorerazor
+ - token from 32 to 34 (</) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.begin.html
+ - token from 34 to 35 (p) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, entity.name.tag.html
+ - token from 35 to 36 (>) with scopes text.aspnetcorerazor, meta.tag.structure.p.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Invalid else suffix 1`] = `
+"Line: else notValid
+ - token from 0 to 14 (else notValid) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Multi line body 1`] = `
+"Line: else if (1 + 1 == 2)
+ - token from 0 to 4 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 5 to 7 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.if.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 (1) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.numeric.decimal.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 11 to 12 (+) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.operator.arithmetic.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 13 to 14 (1) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.numeric.decimal.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 15 to 17 (==) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.operator.comparison.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 18 to 19 (2) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.numeric.decimal.cs
+ - token from 19 to 20 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.close.cs
+
+Line: {
+ - token from 0 to 1 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:     var x = 123;
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 15 (123) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 15 to 16 (;) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+
+Line:     <div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 5 (<) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 5 to 8 (div) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         @if ( AnotherCondition() ) {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (@) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.cshtml.transition
+ - token from 9 to 11 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, keyword.control.conditional.if.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 12 to 13 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 14 to 30 (AnotherCondition) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, entity.name.function.cs
+ - token from 30 to 31 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.open.cs
+ - token from 31 to 32 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 32 to 33 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 33 to 34 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, punctuation.parenthesis.close.cs
+ - token from 34 to 35 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor
+ - token from 35 to 36 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+
+Line:             <p></p>
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 12 to 13 (<) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 13 to 14 (p) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 14 to 15 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 15 to 17 (</) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 17 to 18 (p) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 18 to 19 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, meta.statement.if.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+
+Line:     </div>
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 4 to 6 (</) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 6 to 9 (div) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 9 to 10 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+
+Line: }
+ - token from 0 to 1 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Multi line condition 1`] = `
+"Line: else if (
+ - token from 0 to 4 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 5 to 7 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.if.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.open.cs
+
+Line:     await GetTrueValue(
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 4 to 9 (await) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.other.await.cs
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 10 to 22 (GetTrueValue) with scopes text.aspnetcorerazor, meta.statement.else.razor, entity.name.function.cs
+ - token from 22 to 23 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.open.cs
+
+Line:         () => true,
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 10 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.close.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 11 to 13 (=>) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.operator.arrow.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 14 to 18 (true) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.language.boolean.true.cs
+ - token from 18 to 19 (,) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.separator.comma.cs
+
+Line:         name: "The Good Identifier",
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 12 (name) with scopes text.aspnetcorerazor, meta.statement.else.razor, entity.name.variable.parameter.cs
+ - token from 12 to 13 (:) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.separator.colon.cs
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 14 to 15 (") with scopes text.aspnetcorerazor, meta.statement.else.razor, string.quoted.double.cs, punctuation.definition.string.begin.cs
+ - token from 15 to 34 (The Good Identifier) with scopes text.aspnetcorerazor, meta.statement.else.razor, string.quoted.double.cs
+ - token from 34 to 35 (") with scopes text.aspnetcorerazor, meta.statement.else.razor, string.quoted.double.cs, punctuation.definition.string.end.cs
+ - token from 35 to 36 (,) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.separator.comma.cs
+
+Line:         new {
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 11 (new) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.other.new.cs
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 12 to 13 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.curlybrace.open.cs
+
+Line:             Foo = false,
+ - token from 0 to 12 (            ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 12 to 15 (Foo) with scopes text.aspnetcorerazor, meta.statement.else.razor, variable.other.readwrite.cs
+ - token from 15 to 16 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 16 to 17 (=) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.operator.assignment.cs
+ - token from 17 to 18 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 18 to 23 (false) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.language.boolean.false.cs
+ - token from 23 to 24 (,) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.separator.comma.cs
+
+Line:         }
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 9 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.curlybrace.close.cs
+
+Line: )){}
+ - token from 0 to 1 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.close.cs
+ - token from 1 to 2 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.close.cs
+ - token from 2 to 3 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 3 to 4 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Single line 1`] = `
+"Line: else { var x = 123;<p>Hello World</p> }
+ - token from 0 to 4 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 5 to 6 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 6 to 7 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 7 to 10 (var) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 11 to 12 (x) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 13 to 14 (=) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 15 to 18 (123) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 18 to 19 (;) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 19 to 20 (<) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 20 to 21 (p) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 21 to 22 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 22 to 33 (Hello World) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 33 to 35 (</) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 35 to 36 (p) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 36 to 37 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 37 to 38 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 38 to 39 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Single line, condition 1`] = `
+"Line: else if (true) { var x = 123;<p>Hello World</p> }
+ - token from 0 to 4 (else) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.else.cs
+ - token from 4 to 5 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 5 to 7 (if) with scopes text.aspnetcorerazor, meta.statement.else.razor, keyword.control.conditional.if.cs
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 8 to 9 (() with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.open.cs
+ - token from 9 to 13 (true) with scopes text.aspnetcorerazor, meta.statement.else.razor, constant.language.boolean.true.cs
+ - token from 13 to 14 ()) with scopes text.aspnetcorerazor, meta.statement.else.razor, punctuation.parenthesis.close.cs
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor
+ - token from 15 to 16 ({) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.open.cs
+ - token from 16 to 17 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 17 to 20 (var) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.other.var.cs
+ - token from 20 to 21 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 21 to 22 (x) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.variable.local.cs
+ - token from 22 to 23 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 23 to 24 (=) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, keyword.operator.assignment.cs
+ - token from 24 to 25 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 25 to 28 (123) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, constant.numeric.decimal.cs
+ - token from 28 to 29 (;) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.terminator.statement.cs
+ - token from 29 to 30 (<) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 30 to 31 (p) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 31 to 32 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 32 to 43 (Hello World) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 43 to 45 (</) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.begin.html
+ - token from 45 to 46 (p) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, entity.name.tag.html
+ - token from 46 to 47 (>) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.definition.tag.end.html
+ - token from 47 to 48 ( ) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock
+ - token from 48 to 49 (}) with scopes text.aspnetcorerazor, meta.statement.else.razor, meta.structure.razor.csharp.codeblock, punctuation.curlybrace.close.cs
+"
+`;
+
+exports[`Grammar tests else [if ( ... )] { ... } Unspaced else if part 1`] = `
+"Line: elseif (true) { /* The elseif should not be control scoped */ }
+ - token from 0 to 64 (elseif (true) { /* The elseif should not be control scoped */ }) with scopes text.aspnetcorerazor
+"
+`;
+
+exports[`Grammar tests script block function function declaration 1`] = `
+"Line: <script>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (script) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, entity.name.tag.html
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, punctuation.definition.tag.end.html
+
+Line:     function f()
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js
+ - token from 4 to 12 (function) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, storage.type.function.js
+ - token from 12 to 13 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js
+ - token from 13 to 14 (f) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, meta.definition.function.js, entity.name.function.js
+ - token from 14 to 15 (() with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, meta.parameters.js, punctuation.definition.parameters.begin.js
+ - token from 15 to 16 ()) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, meta.parameters.js, punctuation.definition.parameters.end.js
+
+Line:     {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js
+ - token from 4 to 5 ({) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, meta.block.js, punctuation.definition.block.js
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, meta.block.js
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.function.js, meta.block.js, punctuation.definition.block.js
+
+Line: </script>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.begin.html, source.js-ignored-vscode
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 8 (script) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests script block function script block import 1`] = `
+"Line: <script>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (script) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, entity.name.tag.html
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, punctuation.definition.tag.end.html
+
+Line:     import fs from 'fs';
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js
+ - token from 4 to 10 (import) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js, keyword.control.import.js
+ - token from 10 to 11 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js
+ - token from 11 to 13 (fs) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js, variable.other.readwrite.alias.js
+ - token from 13 to 14 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js
+ - token from 14 to 18 (from) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js, keyword.control.from.js
+ - token from 18 to 19 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js
+ - token from 19 to 20 (') with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js, string.quoted.single.js, punctuation.definition.string.begin.js
+ - token from 20 to 22 (fs) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js, string.quoted.single.js
+ - token from 22 to 23 (') with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.import.js, string.quoted.single.js, punctuation.definition.string.end.js
+ - token from 23 to 24 (;) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, punctuation.terminator.statement.js
+
+Line: </script>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.begin.html, source.js-ignored-vscode
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 8 (script) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests script block function script block var plain 1`] = `
+"Line: <script>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 7 (script) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, entity.name.tag.html
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.start.html, punctuation.definition.tag.end.html
+
+Line:     var x = "test";
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, storage.type.js
+ - token from 7 to 8 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js
+ - token from 8 to 9 (x) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, meta.var-single-variable.expr.js, meta.definition.variable.js, variable.other.readwrite.js
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, meta.var-single-variable.expr.js
+ - token from 10 to 11 (=) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, keyword.operator.assignment.js
+ - token from 11 to 12 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js
+ - token from 12 to 13 (") with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, string.quoted.double.js, punctuation.definition.string.begin.js
+ - token from 13 to 17 (test) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, string.quoted.double.js
+ - token from 17 to 18 (") with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, meta.var.expr.js, string.quoted.double.js, punctuation.definition.string.end.js
+ - token from 18 to 19 (;) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.js, punctuation.terminator.statement.js
+
+Line: </script>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.begin.html, source.js-ignored-vscode
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 8 (script) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, entity.name.tag.html
+ - token from 8 to 9 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.script.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests style block colors css colors declaration 1`] = `
+"Line: <style>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 6 (style) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.start.html, entity.name.tag.html
+ - token from 6 to 7 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.start.html, punctuation.definition.tag.end.html
+
+Line:     hello {
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css
+ - token from 4 to 9 (hello) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.selector.css
+ - token from 9 to 10 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css
+ - token from 10 to 11 ({) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, punctuation.section.property-list.begin.bracket.curly.css
+
+Line:         there: "friend"
+ - token from 0 to 8 (        ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css
+ - token from 8 to 13 (there) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, meta.property-name.css
+ - token from 13 to 14 (:) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, punctuation.separator.key-value.css
+ - token from 14 to 15 ( ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css
+ - token from 15 to 16 (") with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, meta.property-value.css, string.quoted.double.css, punctuation.definition.string.begin.css
+ - token from 16 to 22 (friend) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, meta.property-value.css, string.quoted.double.css
+ - token from 22 to 23 (") with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, meta.property-value.css, string.quoted.double.css, punctuation.definition.string.end.css
+
+Line:     }
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css
+ - token from 4 to 5 (}) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.property-list.css, punctuation.section.property-list.end.bracket.curly.css
+
+Line: </style>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.end.html, punctuation.definition.tag.begin.html, source.css-ignored-vscode
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.end.html, punctuation.definition.tag.begin.html
+ - token from 2 to 7 (style) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.end.html, entity.name.tag.html
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.end.html, punctuation.definition.tag.end.html
+"
+`;
+
+exports[`Grammar tests style block colors css style block var plain 1`] = `
+"Line: <style>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.start.html, punctuation.definition.tag.begin.html
+ - token from 1 to 6 (style) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.start.html, entity.name.tag.html
+ - token from 6 to 7 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, meta.tag.metadata.style.start.html, punctuation.definition.tag.end.html
+
+Line:     var x = "test";
+ - token from 0 to 4 (    ) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css
+ - token from 4 to 7 (var) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.selector.css, entity.name.tag.css
+ - token from 7 to 20 ( x = "test";) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.selector.css
+
+Line: </style>
+ - token from 0 to 1 (<) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.selector.css
+ - token from 1 to 2 (/) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css
+ - token from 2 to 7 (style) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.selector.css, entity.name.tag.css
+ - token from 7 to 8 (>) with scopes text.aspnetcorerazor, meta.embedded.block.html, source.css, meta.selector.css, keyword.operator.combinator.css
+"
+`;
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/addTagHelperDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/addTagHelperDirective.ts
new file mode 100644
index 000000000..5b7791f7c
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/addTagHelperDirective.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunAddTagHelperDirectiveSuite() {
+    describe('@addTagHelper directive', () => {
+        it('No parameter', async () => {
+            await assertMatchesSnapshot('@addTagHelper');
+        });
+
+        it('No parameter, spaced', async () => {
+            await assertMatchesSnapshot('@addTagHelper                 ');
+        });
+
+        it('Incomplete parameter', async () => {
+            await assertMatchesSnapshot('@addTagHelper "');
+        });
+
+        it('Unquoted parameter', async () => {
+            await assertMatchesSnapshot('@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers');
+        });
+
+        it('Quoted parameter', async () => {
+            await assertMatchesSnapshot('@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"');
+        });
+
+        it('Quoted parameter spaced', async () => {
+            await assertMatchesSnapshot(
+                '@addTagHelper       "*     ,      Microsoft.AspNetCore.Mvc.TagHelpers   "            '
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/attributeDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/attributeDirective.ts
new file mode 100644
index 000000000..f21cdab5b
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/attributeDirective.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunAttributeDirectiveSuite() {
+    describe('@attribute directive', () => {
+        it('No attribute', async () => {
+            await assertMatchesSnapshot('@attribute');
+        });
+
+        it('As C# local', async () => {
+            await assertMatchesSnapshot('@attribute.method()');
+        });
+
+        it('No attribute spaced', async () => {
+            await assertMatchesSnapshot('@attribute              ');
+        });
+
+        it('Incomplete attribute, simple', async () => {
+            await assertMatchesSnapshot('@attribute [CustomAttribute');
+        });
+
+        it('Incomplete attribute, generic', async () => {
+            await assertMatchesSnapshot('@attribute [CustomAttribute(info = typeof(GenericClass1<string');
+        });
+
+        it('Single line, simple', async () => {
+            await assertMatchesSnapshot('@attribute [Authorize]');
+        });
+
+        it('Multi line, complex', async () => {
+            await assertMatchesSnapshot(`@attribute [
+    CustomAttribute(
+        Info = typeof(GenericClass<string>),
+        Foo = true
+    )
+]`);
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/codeBlock.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/codeBlock.ts
new file mode 100644
index 000000000..3420310a0
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/codeBlock.ts
@@ -0,0 +1,244 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunCodeBlockSuite() {
+    describe('Razor code blocks @{ ... }', () => {
+        it('Malformed code block', async () => {
+            await assertMatchesSnapshot('@ {}');
+        });
+
+        it('Incomplete code block', async () => {
+            await assertMatchesSnapshot('@{');
+        });
+
+        it('Empty code block', async () => {
+            await assertMatchesSnapshot('@{}');
+        });
+
+        it('Single line local function', async () => {
+            await assertMatchesSnapshot('@{ void Foo() {} }');
+        });
+
+        it('Top level text tag', async () => {
+            await assertMatchesSnapshot('@{ <text>Hello</text> }');
+        });
+
+        it('Nested text text tag', async () => {
+            await assertMatchesSnapshot('@{ <text><text>Hello</text></text> }');
+        });
+
+        it('Nested text tag', async () => {
+            await assertMatchesSnapshot('@{ <p><text>Hello</text></p> }');
+        });
+
+        it('Self-closing component', async () => {
+            await assertMatchesSnapshot('@{ <SurveyPrompt /> }');
+        });
+
+        it('Single line markup simple', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    @: <p> Incomplete
+}`
+            );
+        });
+
+        it('Single line markup complex', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    @:@DateTime.Now <text>Nope</text>
+}`
+            );
+        });
+
+        it('Complex HTML tag structures', async () => {
+            await assertMatchesSnapshot('@{<p><input      /><strong>Hello <hr/> <br> World</strong></p>}');
+        });
+
+        it('Pure C#', async () => {
+            await assertMatchesSnapshot('@{var x = true; Console.WriteLine("Hello World");}');
+        });
+
+        it('Multi line complex', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    var x = true;
+    <text>
+        @{
+            @DateTime.Now
+            @{
+                @{
+
+                }
+            }
+        }
+    </text>
+
+    <p></p>
+<p class="hello <world></p>" @DateTime.Now> Foo<strong @{ <text> can't believe this works </text>}>Bar</strong> Baz
+        <p class="hello world">
+            Below is an incomplete tag
+            </strong>
+        </p>
+
+        <text>This is not a special transition tag</text>
+        Hello World
+    </p>
+    @: <strong> <-- This is incomplete @DateTime.Now
+
+    <input class="hello world">
+
+    void SomeMethod(int value)
+    {
+        Action<int> template = @<strong>Value: @item</strong>;
+        <section>
+            This section is rendered when called: @template(1337)
+        </section>
+    }
+
+    <p>aHello</p>
+
+    if (true) {
+        <p>alksdjfl</p>
+    }
+}`
+            );
+        });
+
+        it('Nested local function with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    void SomeMethod() { <p class="priority"><strong>Hello World</strong></p> }
+}`
+            );
+        });
+
+        it('Nested if statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    if (true)
+    {
+        <p>Hello World!</p>
+    }
+}`
+            );
+        });
+
+        it('Nested for statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    for (var i = 0; i % 2 == 0; i++)
+    {
+        <p>@i</p>
+    }
+}`
+            );
+        });
+
+        it('Nested foreach statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    foreach (var person in people)
+    {
+        <p>@person</p>
+    }
+}`
+            );
+        });
+
+        it('Nested do while statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    var i = 0;
+    do
+    {
+        <p>@i</p>
+    } while (i++ != 10);
+}`
+            );
+        });
+
+        it('Nested while statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    var i = 0;
+    while (i++ != 10)
+    {
+        <p>@i</p>
+    }
+}`
+            );
+        });
+
+        it('Nested lock statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    lock (someObject)
+    {
+        <p>Hello World</p>
+    }
+}`
+            );
+        });
+
+        it('Nested using statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    using (someDisposable)
+    {
+        <p>Hello World</p>
+    }
+}`
+            );
+        });
+
+        it('Nested try statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    try
+    {
+        <p>Hello World</p>
+    } catch (Exception ex){}
+}`
+            );
+        });
+
+        it('Nested switch statement with markup', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    switch (something)
+    {
+        case true:
+            <p>Hello World</p>
+            break;
+    }
+}`
+            );
+        });
+
+        it('Complex with various nested statements', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    if (true) {
+        <div>
+        @using (someDisposable) {
+            <p>Foo!</p>
+            var x = 123;
+            while (i++ % 2 == 0)
+            {
+                <strong>Bar</strong>
+            }
+        }
+        </div>
+    }
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/codeDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/codeDirective.ts
new file mode 100644
index 000000000..aeefed49e
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/codeDirective.ts
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunCodeDirectiveSuite() {
+    describe('@code directive', () => {
+        it('No code block', async () => {
+            await assertMatchesSnapshot('@code');
+        });
+
+        it('Incomplete code block', async () => {
+            await assertMatchesSnapshot('@code {');
+        });
+
+        it('Variable starting with code', async () => {
+            await assertMatchesSnapshot('@codeTest then words');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@code { public void Foo() {} }');
+        });
+
+        it('Single line no whitespace', async () => {
+            await assertMatchesSnapshot('@code{ public void Foo() {} }');
+        });
+
+        it('Single-line comment with curly braces', async () => {
+            await assertMatchesSnapshot(`
+@code {
+    // { var ThisShouldNotBeCSharp = true; }
+}`);
+        });
+
+        it('Multi-line comment with curly braces', async () => {
+            await assertMatchesSnapshot('@code { /* { var ThisShouldNotBeCSharp = true; } */ }');
+        });
+
+        it('Multi line', async () => {
+            await assertMatchesSnapshot(
+                `@code {
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        var someString = "{ var ThisShouldNotBeCSharp = true; }";
+        currentCount++;
+    }
+}`
+            );
+        });
+
+        it('Multi line no whitespace', async () => {
+            await assertMatchesSnapshot(
+                `@code{
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        var someString = "{ var ThisShouldNotBeCSharp = true; }";
+        currentCount++;
+    }
+}`
+            );
+        });
+
+        it('Multi line then newline', async () => {
+            await assertMatchesSnapshot(
+                `@code
+{
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        var someString = "{ var ThisShouldNotBeCSharp = true; }";
+        currentCount++;
+    }
+}`
+            );
+        });
+
+        it('Multi line with property', async () => {
+            await assertMatchesSnapshot(
+                `@code {
+    public string Goo { get; set; }
+
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        var someString = "{ var ThisShouldNotBeCSharp = true; }";
+        currentCount++;
+    }
+}`
+            );
+        });
+
+        it('Multi line with nullable property', async () => {
+            await assertMatchesSnapshot(
+                `@code {
+    public string? Goo { get; set; }
+
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        var someString = "{ var ThisShouldNotBeCSharp = true; }";
+        currentCount++;
+    }
+}`
+            );
+        });
+
+        it('With Razor and markup', async () => {
+            await assertMatchesSnapshot(
+                `@code {
+    private void SomeMethod()
+    {
+        <p>This method <strong>is really</strong> nice!
+
+            @if(true) {
+                <input type="checkbox" value="true" name="Something" />
+            }
+        </p>
+
+        @DateTime.Now
+
+        <input type="hidden" value=" { true }" name="Something">
+    }
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/doStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/doStatement.ts
new file mode 100644
index 000000000..e1248289f
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/doStatement.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunDoStatementSuite() {
+    describe('@do { ... } while ( ... );', () => {
+        it('Incomplete do statement, no body', async () => {
+            await assertMatchesSnapshot('@do');
+        });
+
+        it('Incomplete do while statement, no condition', async () => {
+            await assertMatchesSnapshot('@do { } while ;');
+        });
+
+        it('Incomplete do while statement, no terminator', async () => {
+            await assertMatchesSnapshot('@do { } while');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@do { var x = 123;<p>Hello World</p> }while (   true  );');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@do
+{
+}
+while (
+    await GetATruthyValue(
+        () => true,
+        name: "Hello",
+        new {
+            Foo = false,
+        }
+));`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@do
+{
+    var x = 123;
+    <div>
+        @do {
+            <p></p>
+        } while(GetAnotherValue());
+    </div>
+}while(true);`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    do {
+        <p></p>
+    } while(GetAnotherValue());
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    do not classify this
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/elsePart.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/elsePart.ts
new file mode 100644
index 000000000..6277d86ae
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/elsePart.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunElsePartSuite() {
+    describe('else [if ( ... )] { ... }', () => {
+        it('Incomplete else, no condition or body', async () => {
+            await assertMatchesSnapshot('else');
+        });
+
+        it('Invalid else suffix', async () => {
+            await assertMatchesSnapshot('else notValid');
+        });
+
+        it('Incomplete else if part, no condition', async () => {
+            await assertMatchesSnapshot('else if {}');
+        });
+
+        it('Unspaced else if part', async () => {
+            await assertMatchesSnapshot('elseif (true) { /* The elseif should not be control scoped */ }');
+        });
+
+        it('Invalid else part', async () => {
+            await assertMatchesSnapshot('<p> else if (shouldNotBeElse) {}</p>');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('else { var x = 123;<p>Hello World</p> }');
+        });
+
+        it('Single line, condition', async () => {
+            await assertMatchesSnapshot('else if (true) { var x = 123;<p>Hello World</p> }');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `else if (
+    await GetTrueValue(
+        () => true,
+        name: "The Good Identifier",
+        new {
+            Foo = false,
+        }
+)){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `else if (1 + 1 == 2)
+{
+    var x = 123;
+    <div>
+        @if ( AnotherCondition() ) {
+            <p></p>
+        }
+    </div>
+}`
+            );
+        });
+
+        it('Else integrates with @if, complex', async () => {
+            await assertMatchesSnapshot(
+                `@if (1 + 1 == 2)
+{
+    <p>If else!</p>
+} else
+{
+    var x = 123;
+    <div>
+        @if (true) {} else if (false) {
+            <strong> Woa! </strong>
+            var y = 456;
+        }
+    </div>
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/explicitExpressionInAttribute.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/explicitExpressionInAttribute.ts
new file mode 100644
index 000000000..0028c5cb3
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/explicitExpressionInAttribute.ts
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunExplicitExpressionInAttributeSuite() {
+    describe('Explicit Expressions In Attributes', () => {
+        it('Double Quotes Class explicit expression', async () => {
+            await assertMatchesSnapshot('<div class="@(NavMenuCssClass)"></div>');
+        });
+
+        it('Double Quotes Onclick explicit expression', async () => {
+            await assertMatchesSnapshot('<button @onclick="@(ToggleNavMenu())"></button>');
+        });
+
+        it('Double Quotes Empty', async () => {
+            await assertMatchesSnapshot('<button @onclick="@()"></button>');
+        });
+
+        it('Double Quotes Single line simple', async () => {
+            await assertMatchesSnapshot('<button @onclick="@(DateTime.Now)"></button>');
+        });
+
+        it('Double Quotes Single line complex', async () => {
+            await assertMatchesSnapshot(
+                '<button @onclick="@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])"></button>'
+            );
+        });
+
+        it('Double Quotes Multi line', async () => {
+            await assertMatchesSnapshot(
+                `<button @onclick="@(
+    Html.BeginForm(
+        "Login",
+        "Home",
+        new
+        {
+            @class = "someClass",
+            notValid = Html.DisplayFor<object>(
+                (_) => Model,
+                "name",
+                "someName",
+                new { })
+        })
+)"></button>`
+            );
+        });
+
+        it('Single Quotes Class explicit expression', async () => {
+            await assertMatchesSnapshot("<div class='@(NavMenuCssClass)'></div>");
+        });
+
+        it('Single Quotes Onclick explicit expression', async () => {
+            await assertMatchesSnapshot("<button @onclick='@(ToggleNavMenu())'></button>");
+        });
+
+        it('Single Quotes Empty', async () => {
+            await assertMatchesSnapshot("<button @onclick='@()'></button>");
+        });
+
+        it('Single Quotes Single line simple', async () => {
+            await assertMatchesSnapshot("<button @onclick='@(DateTime.Now)'></button>");
+        });
+
+        it('Single Quotes Single line complex', async () => {
+            await assertMatchesSnapshot(
+                "<button @onclick='@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])'></button>"
+            );
+        });
+
+        it('Single Quotes Multi line', async () => {
+            await assertMatchesSnapshot(
+                `<button @onclick='@(
+    Html.BeginForm(
+        "Login",
+        "Home",
+        new
+        {
+            @class = "someClass",
+            notValid = Html.DisplayFor<object>(
+                (_) => Model,
+                "name",
+                "someName",
+                new { })
+        })
+)'></button>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/explicitExpressions.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/explicitExpressions.ts
new file mode 100644
index 000000000..5db2a5263
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/explicitExpressions.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunExplicitExpressionSuite() {
+    describe('Explicit expressions', () => {
+        it('Empty', async () => {
+            await assertMatchesSnapshot('@()');
+        });
+
+        it('Single line simple', async () => {
+            await assertMatchesSnapshot('@(DateTime.Now)');
+        });
+
+        it('Single line complex', async () => {
+            await assertMatchesSnapshot(
+                '@(456 + new Array<int>(){1,2,3}[0] + await GetValueAsync<string>() ?? someArray[await DoMoreAsync(() => {})])'
+            );
+        });
+
+        it('Multi line', async () => {
+            await assertMatchesSnapshot(
+                `@(
+    Html.BeginForm(
+        "Login",
+        "Home",
+        new
+        {
+            @class = "someClass",
+            notValid = Html.DisplayFor<object>(
+                (_) => Model,
+                "name",
+                "someName",
+                new { })
+        })
+)`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/forStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/forStatement.ts
new file mode 100644
index 000000000..fac1000df
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/forStatement.ts
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunForStatementSuite() {
+    describe('@for ( ... ) { ... }', () => {
+        it('Incomplete for statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@for');
+        });
+
+        it('Incomplete for statement, no condition', async () => {
+            await assertMatchesSnapshot('@for {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@for (var i = 0; i < GetCount(); i++)) { var x = 123;<p>Hello World @i</p> }');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@for (
+    var j = GetInitialValue(name: true);
+    j <= await GetMaxIncrementCount(
+        () => true,
+        name: "The Good Value",
+        new {
+            Foo = false,
+        });
+    j++
+){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@for (var i = 0; i < 10; i++)
+{
+    var x = 123;
+    <div>
+        @for (i = i + 1; i < 10; i+= 2) {
+            <p>@i</p>
+        }
+    </div>
+}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    for (var i = 0; i < 10; i++) {
+        <p></p>
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    for (this) is the best classification
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/foreachStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/foreachStatement.ts
new file mode 100644
index 000000000..92a5b256d
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/foreachStatement.ts
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunForeachStatementSuite() {
+    describe('@foreach ( ... ) { ... }', () => {
+        it('Incomplete await foreach statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@await foreach');
+        });
+
+        it('Incomplete foreach statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@foreach');
+        });
+
+        it('Incomplete foreach statement, no condition', async () => {
+            await assertMatchesSnapshot('@foreach {}');
+        });
+
+        it('Incomplete await foreach statement, no condition', async () => {
+            await assertMatchesSnapshot('@await foreach {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@foreach (var value in Values)) { var x = 123;<p>Hello World @value</p> }');
+        });
+
+        it('Awaited foreach', async () => {
+            await assertMatchesSnapshot(
+                '@await foreach (var value in Values)) { var x = 123;<p>Hello World @value</p> }'
+            );
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@foreach (
+    var value in await GetMaxIncrementCount(
+        () => true,
+        name: "The Good Value",
+        new {
+            Foo = false,
+        })
+){@value}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@foreach (List<int> numbers in LotsOfNumbers)
+{
+    var x = 123;
+    <div>
+        @foreach (int i in numbers) {
+            <p>@i</p>
+        }
+    </div>
+}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    foreach (var i in numbers) {
+        <p></p>
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    foreach (is not) an English word
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/functionsDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/functionsDirective.ts
new file mode 100644
index 000000000..3ee500fb1
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/functionsDirective.ts
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunFunctionsDirectiveSuite() {
+    describe('@functions directive', () => {
+        it('No code block', async () => {
+            await assertMatchesSnapshot('@functions');
+        });
+
+        it('Incomplete code block', async () => {
+            await assertMatchesSnapshot('@functions {');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@functions { public void Foo() {} }');
+        });
+
+        it('Single-line comment with curly braces', async () => {
+            await assertMatchesSnapshot(`
+@functions {
+    // { var ThisShouldNotBeCSharp = true; }
+}`);
+        });
+
+        it('Multi-line comment with curly braces', async () => {
+            await assertMatchesSnapshot('@functions { /* { var ThisShouldNotBeCSharp = true; } */ }');
+        });
+
+        it('Multi line', async () => {
+            await assertMatchesSnapshot(
+                `@functions {
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        var someString = "{ var ThisShouldNotBeCSharp = true; }";
+        currentCount++;
+    }
+}`
+            );
+        });
+
+        it('With Razor and markup', async () => {
+            await assertMatchesSnapshot(
+                `@functions {
+    private void SomeMethod()
+    {
+        <p>This method <strong>is really</strong> nice!
+
+            @if(true) {
+                <input type="checkbox" value="true" name="Something" />
+            }
+        </p>
+
+        @DateTime.Now
+
+        <input type="hidden" value=" { true }" name="Something">
+    }
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/grammarTests.test.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/grammarTests.test.ts
new file mode 100644
index 000000000..339eea592
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/grammarTests.test.ts
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RunAddTagHelperDirectiveSuite } from './addTagHelperDirective';
+import { RunAttributeDirectiveSuite } from './attributeDirective';
+import { RunCodeBlockSuite } from './codeBlock';
+import { RunCodeDirectiveSuite } from './codeDirective';
+import { RunDoStatementSuite } from './doStatement';
+import { RunElsePartSuite } from './elsePart';
+import { RunExplicitExpressionInAttributeSuite } from './explicitExpressionInAttribute';
+import { RunExplicitExpressionSuite } from './explicitExpressions';
+import { RunForeachStatementSuite } from './foreachStatement';
+import { RunForStatementSuite } from './forStatement';
+import { RunFunctionsDirectiveSuite } from './functionsDirective';
+import { RunIfStatementSuite } from './ifStatement';
+import { RunImplementsDirectiveSuite } from './implementsDirective';
+import { RunImplicitExpressionInAttributeSuite } from './implicitExpressionInAttribute';
+import { RunImplicitExpressionSuite } from './implicitExpressions';
+import { RunInheritsDirectiveSuite } from './inheritsDirective';
+import { RunInjectDirectiveSuite } from './injectDirective';
+import { RunLayoutDirectiveSuite } from './layoutDirective';
+import { RunLockStatementSuite } from './lockStatement';
+import { RunModelDirectiveSuite } from './modelDirective';
+import { RunNamespaceDirectiveSuite } from './namespaceDirective';
+import { RunPageDirectiveSuite } from './pageDirective';
+import { RunRazorCommentSuite } from './razorComment';
+import { RunRazorTemplateSuite } from './razorTemplate';
+import { RunRemoveTagHelperDirectiveSuite } from './removeTagHelperDirective';
+import { RunScriptBlockSuite } from './scriptBlock';
+import { RunSectionDirectiveSuite } from './sectionDirective';
+import { RunStyleBlockSuite } from './styleBlock';
+import { RunSwitchStatementSuite } from './switchStatement';
+import { RunTagHelperPrefixDirectiveSuite } from './tagHelperPrefixDirective';
+import { RunTransitionsSuite } from './transitions';
+import { RunTryStatementSuite } from './tryStatement';
+import { RunUsingDirectiveSuite } from './usingDirective';
+import { RunUsingStatementSuite } from './usingStatement';
+import { RunWhileStatementSuite } from './whileStatement';
+
+// We bring together all test suites and wrap them in one here. The reason behind this is that
+// modules get reloaded per test suite and the vscode-textmate library doesn't support the way
+// that Jest reloads those modules. By wrapping all suites in one we can guaruntee that the
+// modules don't get torn down inbetween suites.
+
+describe('Grammar tests', () => {
+    RunTransitionsSuite();
+    RunExplicitExpressionSuite();
+    RunExplicitExpressionInAttributeSuite();
+    RunImplicitExpressionSuite();
+    RunImplicitExpressionInAttributeSuite();
+    RunCodeBlockSuite();
+    RunRazorCommentSuite();
+    RunRazorTemplateSuite();
+
+    // Directives
+    RunCodeDirectiveSuite();
+    RunFunctionsDirectiveSuite();
+    RunPageDirectiveSuite();
+    RunAddTagHelperDirectiveSuite();
+    RunRemoveTagHelperDirectiveSuite();
+    RunTagHelperPrefixDirectiveSuite();
+    RunModelDirectiveSuite();
+    RunImplementsDirectiveSuite();
+    RunInheritsDirectiveSuite();
+    RunNamespaceDirectiveSuite();
+    RunInjectDirectiveSuite();
+    RunAttributeDirectiveSuite();
+    RunSectionDirectiveSuite();
+    RunLayoutDirectiveSuite();
+    RunUsingDirectiveSuite();
+
+    // Razor C# Control Structures
+    RunUsingStatementSuite();
+    RunIfStatementSuite();
+    RunElsePartSuite();
+    RunForStatementSuite();
+    RunForeachStatementSuite();
+    RunWhileStatementSuite();
+    RunSwitchStatementSuite();
+    RunLockStatementSuite();
+    RunDoStatementSuite();
+    RunTryStatementSuite();
+
+    // Html stuff
+    RunScriptBlockSuite();
+    RunStyleBlockSuite();
+});
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/ifStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/ifStatement.ts
new file mode 100644
index 000000000..062286fb9
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/ifStatement.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunIfStatementSuite() {
+    describe('@if ( ... ) { ... }', () => {
+        it('Incomplete if statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@if');
+        });
+
+        it('Incomplete if statement, no condition', async () => {
+            await assertMatchesSnapshot('@if {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@if (true) { var x = 123;<p>Hello World</p> }');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@if (
+    await GetTrueValue(
+        () => true,
+        name: "The Good Identifier",
+        new {
+            Foo = false,
+        }
+)){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@if (1 + 1 == 2)
+{
+    var x = 123;
+    <div>
+        @if ( AnotherCondition() ) {
+            <p></p>
+        }
+    </div>
+}else if (true){}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    if (true) {
+        <p></p>
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    if (this is classified) we have a problem
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implementsDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implementsDirective.ts
new file mode 100644
index 000000000..b167f9eac
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implementsDirective.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunImplementsDirectiveSuite() {
+    describe('@implements directive', () => {
+        it('No type', async () => {
+            await assertMatchesSnapshot('@implements');
+        });
+
+        it('No type spaced', async () => {
+            await assertMatchesSnapshot('@implements              ');
+        });
+
+        it('Incomplete type, generic', async () => {
+            await assertMatchesSnapshot('@implements SomeInterface<string');
+        });
+
+        it('Type provided', async () => {
+            await assertMatchesSnapshot('@implements Person');
+        });
+
+        it('Type provided spaced', async () => {
+            await assertMatchesSnapshot('@implements              Person         ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implicitExpressionInAttribute.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implicitExpressionInAttribute.ts
new file mode 100644
index 000000000..4178732de
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implicitExpressionInAttribute.ts
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunImplicitExpressionInAttributeSuite() {
+    describe('Implicit Expressions In Attributes', () => {
+        it('Double Quotes Class implicit expression', async () => {
+            await assertMatchesSnapshot('<div class="@NavMenuCssClass"></div>');
+        });
+
+        it('Double Quotes Onclick implicit expression', async () => {
+            await assertMatchesSnapshot('<button @onclick="@ToggleNavMenu()"></button>');
+        });
+
+        it('Double Quotes Onclick function name', async () => {
+            await assertMatchesSnapshot('<button @onclick="ToggleNavMenu"></button>');
+        });
+
+        it('Double Quotes Email address, not implicit expression', async () => {
+            await assertMatchesSnapshot('<button @onclick="abc@DateTime.Now"></button>');
+        });
+
+        it('Double Quotes Parenthesis prefix', async () => {
+            await assertMatchesSnapshot('<button @onclick=")@DateTime.Now"></button>');
+        });
+
+        it('Double Quotes Punctuation prefix', async () => {
+            await assertMatchesSnapshot('<button @onclick=".@DateTime.Now"></button>');
+        });
+
+        it('Double Quotes Close curly prefix', async () => {
+            await assertMatchesSnapshot('<button @onclick="}@DateTime.Now"></button>');
+        });
+
+        it('Double Quotes Empty', async () => {
+            await assertMatchesSnapshot('<button @onclick="@"></button>');
+        });
+
+        it('Double Quotes Open curly suffix', async () => {
+            await assertMatchesSnapshot('<button @onclick="@DateTime.Now{"></button>');
+        });
+
+        it('Double Quotes Close curly suffix', async () => {
+            await assertMatchesSnapshot('<button @onclick="@DateTime.Now}"></button>');
+        });
+
+        it('Double Quotes Close parenthesis suffix', async () => {
+            await assertMatchesSnapshot('<button @onclick="@DateTime.Now)"></button>');
+        });
+
+        it('Double Quotes Close parenthesis suffix', async () => {
+            await assertMatchesSnapshot('<button @onclick="@DateTime.Now]"></button>');
+        });
+
+        it('Double Quotes Single line simple', async () => {
+            await assertMatchesSnapshot('<button @onclick="@DateTime.Now"></button>');
+        });
+
+        it('Double Quotes Awaited property', async () => {
+            await assertMatchesSnapshot('<button @onclick="@await AsyncProperty"></button>');
+        });
+
+        it('Double Quotes Awaited method invocation', async () => {
+            await assertMatchesSnapshot('<button @onclick="@await AsyncMethod()"></button>');
+        });
+
+        it('Double Quotes Single line complex', async () => {
+            await assertMatchesSnapshot(
+                '<button @onclick="@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)"></button>'
+            );
+        });
+
+        it('Double Quotes Combined with HTML', async () => {
+            await assertMatchesSnapshot('<button @onclick="<p>@DateTime.Now</p>"></button>');
+        });
+
+        it('Double Quotes Multi line', async () => {
+            await assertMatchesSnapshot(
+                `<button @onclick="@DateTime!.Now()[1234 +
+5678](
+abc()!.Current,
+1 + 2 + getValue())?.ToString[123](
+() =>
+{
+    var x = 123;
+    var y = true;
+
+    return y ? x : 457;
+})"></button>`
+            );
+        });
+
+        it('Single Quotes Class implicit expression', async () => {
+            await assertMatchesSnapshot("<div class='@NavMenuCssClass'></div>");
+        });
+
+        it('Single Quotes Onclick implicit expression', async () => {
+            await assertMatchesSnapshot("<button @onclick='@ToggleNavMenu()'></button>");
+        });
+
+        it('Single Quotes Onclick function name', async () => {
+            await assertMatchesSnapshot("<button @onclick='ToggleNavMenu'></button>");
+        });
+
+        it('Single Quotes Email address, not implicit expression', async () => {
+            await assertMatchesSnapshot("<button @onclick='abc@DateTime.Now'></button>");
+        });
+
+        it('Single Quotes Parenthesis prefix', async () => {
+            await assertMatchesSnapshot("<button @onclick=')@DateTime.Now'></button>");
+        });
+
+        it('Single Quotes Punctuation prefix', async () => {
+            await assertMatchesSnapshot("<button @onclick='.@DateTime.Now'></button>");
+        });
+
+        it('Single Quotes Close curly prefix', async () => {
+            await assertMatchesSnapshot("<button @onclick='}@DateTime.Now'></button>");
+        });
+
+        it('Single Quotes Empty', async () => {
+            await assertMatchesSnapshot("<button @onclick='@'></button>");
+        });
+
+        it('Single Quotes Open curly suffix', async () => {
+            await assertMatchesSnapshot("<button @onclick='@DateTime.Now{'></button>");
+        });
+
+        it('Single Quotes Close curly suffix', async () => {
+            await assertMatchesSnapshot("<button @onclick='@DateTime.Now}'></button>");
+        });
+
+        it('Single Quotes Close parenthesis suffix', async () => {
+            await assertMatchesSnapshot("<button @onclick='@DateTime.Now)'></button>");
+        });
+
+        it('Single Quotes Close parenthesis suffix', async () => {
+            await assertMatchesSnapshot("<button @onclick='@DateTime.Now]'></button>");
+        });
+
+        it('Single Quotes Single line simple', async () => {
+            await assertMatchesSnapshot("<button @onclick='@DateTime.Now'></button>");
+        });
+
+        it('Single Quotes Awaited property', async () => {
+            await assertMatchesSnapshot("<button @onclick='@await AsyncProperty'></button>");
+        });
+
+        it('Single Quotes Awaited method invocation', async () => {
+            await assertMatchesSnapshot("<button @onclick='@await AsyncMethod()'></button>");
+        });
+
+        it('Single Quotes Single line complex', async () => {
+            await assertMatchesSnapshot(
+                "<button @onclick='@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)'></button>"
+            );
+        });
+
+        it('Single Quotes Combined with HTML', async () => {
+            await assertMatchesSnapshot("<button @onclick='<p>@DateTime.Now</p>'></button>");
+        });
+
+        it('Single Quotes Multi line', async () => {
+            await assertMatchesSnapshot(
+                `<button @onclick='@DateTime!.Now()[1234 +
+5678](
+abc()!.Current,
+1 + 2 + getValue())?.ToString[123](
+() =>
+{
+    var x = 123;
+    var y = true;
+
+    return y ? x : 457;
+})'></button>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implicitExpressions.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implicitExpressions.ts
new file mode 100644
index 000000000..4eeb1a896
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/implicitExpressions.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunImplicitExpressionSuite() {
+    describe('Implicit Expressions', () => {
+        it('Email address, not implicit expression', async () => {
+            await assertMatchesSnapshot('abc@DateTime.Now');
+        });
+
+        it('Parenthesis prefix', async () => {
+            await assertMatchesSnapshot(')@DateTime.Now');
+        });
+
+        it('Punctuation prefix', async () => {
+            await assertMatchesSnapshot('.@DateTime.Now');
+        });
+
+        it('Close curly prefix', async () => {
+            await assertMatchesSnapshot('}@DateTime.Now');
+        });
+
+        it('Empty', async () => {
+            await assertMatchesSnapshot('@');
+        });
+
+        it('Open curly suffix', async () => {
+            await assertMatchesSnapshot('@DateTime.Now{');
+        });
+
+        it('Close curly suffix', async () => {
+            await assertMatchesSnapshot('@DateTime.Now}');
+        });
+
+        it('Close parenthesis suffix', async () => {
+            await assertMatchesSnapshot('@DateTime.Now)');
+        });
+
+        it('Close parenthesis suffix', async () => {
+            await assertMatchesSnapshot('@DateTime.Now]');
+        });
+
+        it('Single line simple', async () => {
+            await assertMatchesSnapshot('@DateTime.Now');
+        });
+
+        it('Awaited property', async () => {
+            await assertMatchesSnapshot('@await AsyncProperty');
+        });
+
+        it('Awaited method invocation', async () => {
+            await assertMatchesSnapshot('@await AsyncMethod()');
+        });
+
+        it('Single line complex', async () => {
+            await assertMatchesSnapshot(
+                '@DateTime!.Now()[1234 + 5678](abc()!.Current, 1 + 2 + getValue())?.ToString[123](() => 456)'
+            );
+        });
+
+        it('Combined with HTML', async () => {
+            await assertMatchesSnapshot('<p>@DateTime.Now</p>');
+        });
+
+        it('Multi line', async () => {
+            await assertMatchesSnapshot(
+                `@DateTime!.Now()[1234 +
+5678](
+abc()!.Current,
+1 + 2 + getValue())?.ToString[123](
+() =>
+{
+    var x = 123;
+    var y = true;
+
+    return y ? x : 457;
+})`
+            );
+        });
+    });
+}
diff --git a/src/razor/src/semantic/semanticTokensResponse.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/ITokenizedContent.ts
similarity index 63%
rename from src/razor/src/semantic/semanticTokensResponse.ts
rename to test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/ITokenizedContent.ts
index 3c0a9cb50..6e0e30d35 100644
--- a/src/razor/src/semantic/semanticTokensResponse.ts
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/ITokenizedContent.ts
@@ -3,6 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export class SemanticTokensResponse {
-    constructor(public readonly data: Array<number>, public readonly resultId?: string) {}
+import { ITokenizeLineResult } from 'vscode-textmate';
+
+export interface ITokenizedContent {
+    readonly source: string;
+    readonly lines: string[];
+    readonly tokenizedLines: ITokenizeLineResult[];
 }
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/snapshotFactory.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/snapshotFactory.ts
new file mode 100644
index 000000000..7e0907050
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/snapshotFactory.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITokenizedContent } from './ITokenizedContent';
+
+export function createSnapshot(tokenizedContent: ITokenizedContent): string {
+    const snapshotLines: string[] = [];
+    for (let i = 0; i < tokenizedContent.tokenizedLines.length; i++) {
+        const line = tokenizedContent.lines[i];
+        const tokenizedLine = tokenizedContent.tokenizedLines[i];
+
+        snapshotLines.push(`Line: ${line}`);
+        for (const token of tokenizedLine.tokens) {
+            snapshotLines.push(
+                ` - token from ${token.startIndex} to ${token.endIndex} ` +
+                    `(${line.substring(token.startIndex, token.endIndex)}) ` +
+                    `with scopes ${token.scopes.join(', ')}`
+            );
+        }
+        snapshotLines.push('');
+    }
+
+    const snapshot = snapshotLines.join('\n');
+    return snapshot;
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/testUtilities.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/testUtilities.ts
new file mode 100644
index 000000000..36acf8d37
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/testUtilities.ts
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { expect } from '@jest/globals';
+import { createSnapshot } from './snapshotFactory';
+import { tokenize } from './tokenizedContentProvider';
+
+export async function assertMatchesSnapshot(content: string) {
+    const tokenizedContent = await tokenize(content);
+    const currentSnapshot = createSnapshot(tokenizedContent);
+    expect(currentSnapshot).toMatchSnapshot();
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/tokenizedContentProvider.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/tokenizedContentProvider.ts
new file mode 100644
index 000000000..61fe9432c
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/infrastructure/tokenizedContentProvider.ts
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as oniguruma from 'vscode-oniguruma';
+import { IGrammar, INITIAL, IRawGrammar, ITokenizeLineResult, parseRawGrammar, Registry } from 'vscode-textmate';
+import { ITokenizedContent } from './ITokenizedContent';
+
+let razorGrammarCache: IGrammar | undefined;
+
+const wasmBin = fs.readFileSync(
+    path.join(__dirname, '../../../../../node_modules/vscode-oniguruma/release/onig.wasm')
+).buffer;
+const vscodeOnigurumaLib = oniguruma.loadWASM(wasmBin).then(() => {
+    return {
+        createOnigScanner: (patterns: string[]) => new oniguruma.OnigScanner(patterns),
+        createOnigString: (s: string) => new oniguruma.OnigString(s),
+    };
+});
+
+export async function tokenize(source: string) {
+    const lines = source.split('\n');
+    const grammar = await loadRazorGrammar();
+    const tokenizedLines: ITokenizeLineResult[] = [];
+
+    let ruleStack = INITIAL;
+    for (const line of lines) {
+        const tokenizedLine = grammar.tokenizeLine(line, ruleStack);
+        tokenizedLines.push(tokenizedLine);
+        ruleStack = tokenizedLine.ruleStack;
+    }
+
+    const tokenizedContent: ITokenizedContent = {
+        source,
+        lines,
+        tokenizedLines,
+    };
+    return tokenizedContent;
+}
+
+async function loadRazorGrammar() {
+    if (!razorGrammarCache) {
+        const registry = new Registry({
+            onigLib: vscodeOnigurumaLib,
+            loadGrammar: loadRawGrammarFromScope,
+        });
+
+        const razorGrammar = await registry.loadGrammar('text.aspnetcorerazor');
+        if (!razorGrammar) {
+            throw new Error('Could not load Razor grammar');
+        }
+
+        razorGrammarCache = razorGrammar;
+    }
+
+    return razorGrammarCache;
+}
+
+async function loadRawGrammarFromScope(scopeName: string) {
+    const scopeToRawGrammarFilePath = await getScopeToFilePathRegistry();
+    const grammar = scopeToRawGrammarFilePath[scopeName];
+    if (!grammar) {
+        // Unknown scope
+        throw new Error(`Unknown scope name when loading raw grammar: ${scopeName}`);
+    }
+
+    return grammar;
+}
+
+async function loadRawGrammar(filePath: string) {
+    const fileBuffer = await readFile(filePath);
+    const fileContent = fileBuffer.toString();
+    const rawGrammar = parseRawGrammar(fileContent, filePath);
+    return rawGrammar;
+}
+
+async function getScopeToFilePathRegistry() {
+    const razorRawGrammar = await loadRawGrammar('src/razor/syntaxes/aspnetcorerazor.tmLanguage.json');
+    const htmlRawGrammar = await loadRawGrammar(
+        'test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json'
+    );
+    const cssRawGrammar = await loadRawGrammar(
+        'test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/css.tmLanguage.json'
+    );
+    const javaScriptRawGrammar = await loadRawGrammar(
+        'test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/JavaScript.tmLanguage.json'
+    );
+    const csharpRawGrammar = await loadRawGrammar(
+        'test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/csharp.tmLanguage.json'
+    );
+    const scopeToRawGrammarFilePath: { [key: string]: IRawGrammar } = {
+        'text.aspnetcorerazor': razorRawGrammar,
+        'text.html.basic': htmlRawGrammar,
+        'source.css': cssRawGrammar,
+        'source.js': javaScriptRawGrammar,
+        'source.cs': csharpRawGrammar,
+    };
+
+    return scopeToRawGrammarFilePath;
+}
+
+async function readFile(filePath: string): Promise<Buffer> {
+    return new Promise((resolve, reject) => {
+        fs.readFile(filePath, (error, data) => (error ? reject(error) : resolve(data)));
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/inheritsDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/inheritsDirective.ts
new file mode 100644
index 000000000..09b911fa6
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/inheritsDirective.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunInheritsDirectiveSuite() {
+    describe('@inherits directive', () => {
+        it('No type', async () => {
+            await assertMatchesSnapshot('@inherits');
+        });
+
+        it('No type spaced', async () => {
+            await assertMatchesSnapshot('@inherits              ');
+        });
+
+        it('Incomplete type, generic', async () => {
+            await assertMatchesSnapshot('@inherits SomeViewBase<string');
+        });
+
+        it('Type provided', async () => {
+            await assertMatchesSnapshot('@inherits Person');
+        });
+
+        it('Type provided spaced', async () => {
+            await assertMatchesSnapshot('@inherits              Person         ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/injectDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/injectDirective.ts
new file mode 100644
index 000000000..b056d2845
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/injectDirective.ts
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunInjectDirectiveSuite() {
+    describe('@inject directive', () => {
+        it('No parameters', async () => {
+            await assertMatchesSnapshot('@inject');
+        });
+
+        it('No parameters spaced', async () => {
+            await assertMatchesSnapshot('@inject              ');
+        });
+
+        it('Incomplete type, generic', async () => {
+            await assertMatchesSnapshot('@inject List<string');
+        });
+
+        it('Incomplete type, tuple', async () => {
+            await assertMatchesSnapshot('@inject (string abc, bool def');
+        });
+
+        it('Invalid property', async () => {
+            await assertMatchesSnapshot('@inject DateTime !Something');
+        });
+
+        it('Fulfilled inject', async () => {
+            await assertMatchesSnapshot('@inject DateTime TheTime');
+        });
+
+        it('Fulfilled inject spaced', async () => {
+            await assertMatchesSnapshot('@inject      DateTime        TheTime         ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/layoutDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/layoutDirective.ts
new file mode 100644
index 000000000..45d3d7b08
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/layoutDirective.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunLayoutDirectiveSuite() {
+    describe('@layout directive', () => {
+        it('No type', async () => {
+            await assertMatchesSnapshot('@layout');
+        });
+
+        it('No type spaced', async () => {
+            await assertMatchesSnapshot('@layout              ');
+        });
+
+        it('Incomplete type, generic', async () => {
+            await assertMatchesSnapshot('@layout MainLayout<string');
+        });
+
+        it('Type provided', async () => {
+            await assertMatchesSnapshot('@layout MainLayout');
+        });
+
+        it('Type provided spaced', async () => {
+            await assertMatchesSnapshot('@layout              MainLayout         ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/lockStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/lockStatement.ts
new file mode 100644
index 000000000..7d0d303bb
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/lockStatement.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunLockStatementSuite() {
+    describe('@lock ( ... ) { ... }', () => {
+        it('Incomplete lock statement, no reference or body', async () => {
+            await assertMatchesSnapshot('@lock');
+        });
+
+        it('Incomplete lock statement, no reference', async () => {
+            await assertMatchesSnapshot('@lock {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@lock (someObject) { var x = 123;<p>Hello World</p> }');
+        });
+
+        it('Multi line reference', async () => {
+            await assertMatchesSnapshot(
+                `@lock (
+    await GetSomeObjectAsync(
+        () => true,
+        name: "The Good Disposable",
+        new {
+            Foo = false,
+        }
+)){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@lock (SomeObject)
+{
+    var x = 123;
+    <div>
+        @lock (GetAnotherObject()) {
+            <p></p>
+        }
+    </div>
+}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    lock (SomeObject) {
+        <p></p>
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    lock (the taskbar)
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/modelDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/modelDirective.ts
new file mode 100644
index 000000000..aaf8aac6c
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/modelDirective.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunModelDirectiveSuite() {
+    describe('@model directive', () => {
+        it('No model', async () => {
+            await assertMatchesSnapshot('@model');
+        });
+
+        it('No model spaced', async () => {
+            await assertMatchesSnapshot('@model              ');
+        });
+
+        it('Incomplete model, generic', async () => {
+            await assertMatchesSnapshot('@model List<string');
+        });
+
+        it('Incomplete model, tuple', async () => {
+            await assertMatchesSnapshot('@model (string abc, bool def');
+        });
+
+        it('Model provided', async () => {
+            await assertMatchesSnapshot('@model Person');
+        });
+
+        it('Model provided spaced', async () => {
+            await assertMatchesSnapshot('@model              Person         ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/namespaceDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/namespaceDirective.ts
new file mode 100644
index 000000000..c342cadaa
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/namespaceDirective.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunNamespaceDirectiveSuite() {
+    describe('@namespace directive', () => {
+        it('No namespace', async () => {
+            await assertMatchesSnapshot('@namespace');
+        });
+
+        it('No namespace spaced', async () => {
+            await assertMatchesSnapshot('@namespace              ');
+        });
+
+        it('Incomplete namespace', async () => {
+            await assertMatchesSnapshot('@namespace MyApp.');
+        });
+
+        it('Broken up namespace', async () => {
+            await assertMatchesSnapshot('@namespace     MyApp  .  Models  .   Data    ');
+        });
+
+        it('Namespace provided', async () => {
+            await assertMatchesSnapshot('@namespace MyApp');
+        });
+
+        it('Namespace provided spaced', async () => {
+            await assertMatchesSnapshot('@namespace     MyApp.Models.Data    ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/pageDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/pageDirective.ts
new file mode 100644
index 000000000..20a98a0dc
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/pageDirective.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunPageDirectiveSuite() {
+    describe('@page directive', () => {
+        it('No route', async () => {
+            await assertMatchesSnapshot('@page');
+        });
+
+        it('No route spaced', async () => {
+            await assertMatchesSnapshot('@page              ');
+        });
+
+        it('Incomplete route', async () => {
+            await assertMatchesSnapshot('@page "');
+        });
+
+        it('Routed', async () => {
+            await assertMatchesSnapshot('@page "/counter"');
+        });
+
+        it('Routed spaced', async () => {
+            await assertMatchesSnapshot('@page              "/counter"         ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/razorComment.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/razorComment.ts
new file mode 100644
index 000000000..d33c1f719
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/razorComment.ts
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunRazorCommentSuite() {
+    describe('Razor comment', () => {
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@* Hello *@');
+        });
+
+        it('Multiple line', async () => {
+            await assertMatchesSnapshot(
+                `@* Hello, this is a
+multiline Razor comment. *@`
+            );
+        });
+
+        it('Empty', async () => {
+            await assertMatchesSnapshot(`@**@`);
+        });
+
+        it('Nested', async () => {
+            await assertMatchesSnapshot(`@* Hello @* World *@ *@`);
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/razorTemplate.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/razorTemplate.ts
new file mode 100644
index 000000000..2958c1c47
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/razorTemplate.ts
@@ -0,0 +1,212 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunRazorTemplateSuite() {
+    describe('Razor templates @<p>....</p>', () => {
+        it('Malformed', async () => {
+            await assertMatchesSnapshot('@ <p></p>');
+        });
+
+        it('Malformed attributes', async () => {
+            await assertMatchesSnapshot('@<p class="></p>');
+        });
+
+        it('Incomplete', async () => {
+            await assertMatchesSnapshot('@<strong>');
+        });
+
+        it('Empty', async () => {
+            await assertMatchesSnapshot('@<p></p>');
+        });
+
+        it('Void', async () => {
+            await assertMatchesSnapshot('@<hr>');
+        });
+
+        it('Self-closing', async () => {
+            await assertMatchesSnapshot('@<hr class="stuff" />');
+        });
+
+        it('Single line local variable', async () => {
+            await assertMatchesSnapshot('@{ Action<object> abc = @<div>Hello World</p>; }');
+        });
+
+        it('Nested template', async () => {
+            await assertMatchesSnapshot(
+                '@{ Action<object> abc = @<div>@{ Action<object> def = @<p class="john" onclick=\'someMethod\'>Hello World</p>; }</div>; }'
+            );
+        });
+
+        it('Complex HTML tag structure non-template', async () => {
+            await assertMatchesSnapshot('@{@<p><input      /><strong>Hello <hr/> <br> World</strong></p>}');
+        });
+
+        it('Nested template in @code directive', async () => {
+            await assertMatchesSnapshot(
+                `@code {
+    public Action<int> GetTemplate()
+    {
+        Action<int> template = @<p>@item</p>;
+        return template;
+    }
+}`
+            );
+        });
+
+        it('Nested template in @functions directive', async () => {
+            await assertMatchesSnapshot(
+                `@functions {
+    public Action<int> GetTemplate()
+    {
+        Action<int> template = @<p>@item</p>;
+        return template;
+    }
+}`
+            );
+        });
+
+        it('Nested template in implicit expression', async () => {
+            await assertMatchesSnapshot(
+                `@CallSomeMethod(@<p style="margin:1px;">
+    The Template
+</p>)`
+            );
+        });
+
+        it('Nested template in explicit expression', async () => {
+            await assertMatchesSnapshot(
+                `@(CallSomeMethod(@<p>
+    The Template
+</p>))`
+            );
+        });
+
+        it('Nested for statement with templates', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    for (var i = 0; i % 2 == 0; i++)
+    {
+        Action<int> template = @<p>@item</p>;
+        @template(i)
+    }
+}`
+            );
+        });
+
+        it('Nested foreach statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    foreach (var person in people)
+    {
+        Action<int> template = @<p>@item</p>;
+        @template(i)
+    }
+}`
+            );
+        });
+
+        it('Nested do while statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    var i = 0;
+    do
+    {
+        Action<int> template = @<p>@item</p>;
+        @template(i)
+    } while (i++ != 10);
+}`
+            );
+        });
+
+        it('Nested while statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    var i = 0;
+    while (i++ != 10)
+    {
+        Action<int> template = @<p>@item</p>;
+        @template(i)
+    }
+}`
+            );
+        });
+
+        it('Nested lock statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    lock (someObject)
+    {
+        Action<string> template = @<p class="world">@item</p>;
+        @template(someObject.ToString())
+    }
+}`
+            );
+        });
+
+        it('Nested using statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    using (someDisposable)
+    {
+        Action<int> template = @<p>@item</p>;
+    }
+}`
+            );
+        });
+
+        it('Nested try statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    try
+    {
+        Action<int> template = @<p>@item</p>;
+    } catch (Exception ex){}
+}`
+            );
+        });
+
+        it('Nested switch statement with template', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    switch (something)
+    {
+        case true:
+            Action<int> template = @<p>@item</p>;
+            break;
+    }
+}`
+            );
+        });
+
+        it('Complex with various nested statements', async () => {
+            await assertMatchesSnapshot(
+                `@{
+    if (true) {
+        <div>
+        @using (someDisposable) {
+            <p>Foo!</p>
+            var x = 123;
+            while (i++ % 2 == 0)
+            {
+                Action<int> template = @<p>
+                    @item
+
+                    @{
+                        Action anotherTemplate = @<strong class='really loud!'>LOUD</strong>;
+                    }
+                    </p>;
+            }
+        }
+        </div>
+    }
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/removeTagHelperDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/removeTagHelperDirective.ts
new file mode 100644
index 000000000..f03a4103e
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/removeTagHelperDirective.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunRemoveTagHelperDirectiveSuite() {
+    describe('@removeTagHelper directive', () => {
+        it('No parameter', async () => {
+            await assertMatchesSnapshot('@removeTagHelper');
+        });
+
+        it('No parameter, spaced', async () => {
+            await assertMatchesSnapshot('@removeTagHelper                 ');
+        });
+
+        it('Incomplete parameter', async () => {
+            await assertMatchesSnapshot('@removeTagHelper "');
+        });
+
+        it('Unquoted parameter', async () => {
+            await assertMatchesSnapshot('@removeTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers');
+        });
+
+        it('Quoted parameter', async () => {
+            await assertMatchesSnapshot('@removeTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"');
+        });
+
+        it('Quoted parameter spaced', async () => {
+            await assertMatchesSnapshot(
+                '@removeTagHelper       "*     ,      Microsoft.AspNetCore.Mvc.TagHelpers   "            '
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/scriptBlock.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/scriptBlock.ts
new file mode 100644
index 000000000..d9729835b
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/scriptBlock.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunScriptBlockSuite() {
+    describe('script block function', () => {
+        it('function declaration', async () => {
+            await assertMatchesSnapshot(
+                `<script>
+    function f()
+    {
+    }
+</script>`
+            );
+        });
+
+        it('script block var plain', async () => {
+            await assertMatchesSnapshot(
+                `<script>
+    var x = "test";
+</script>`
+            );
+        });
+
+        it('script block import', async () => {
+            await assertMatchesSnapshot(
+                `<script>
+    import fs from 'fs';
+</script>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/sectionDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/sectionDirective.ts
new file mode 100644
index 000000000..9e3fd380f
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/sectionDirective.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunSectionDirectiveSuite() {
+    describe('@section directive', () => {
+        it('No name', async () => {
+            await assertMatchesSnapshot('@section');
+        });
+
+        it('As C# local', async () => {
+            await assertMatchesSnapshot('@section.method()');
+        });
+
+        it('No name, spaced', async () => {
+            await assertMatchesSnapshot('@section                 ');
+        });
+
+        it('Invalid name', async () => {
+            await assertMatchesSnapshot('@section -$*&^');
+        });
+
+        it('Single line incomplete body', async () => {
+            await assertMatchesSnapshot('@section Name {');
+        });
+
+        it('Multi line incomplete body', async () => {
+            await assertMatchesSnapshot(`@section
+Name
+{`);
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@section Name {@DateTime.Now}');
+        });
+
+        it('Multi line complex', async () => {
+            await assertMatchesSnapshot(
+                `@section Name {
+    <section>
+        @DateTime.Now
+        @section INVALID {}
+    </section>
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/styleBlock.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/styleBlock.ts
new file mode 100644
index 000000000..967257cef
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/styleBlock.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunStyleBlockSuite() {
+    describe('style block colors css', () => {
+        it('colors declaration', async () => {
+            await assertMatchesSnapshot(
+                `<style>
+    hello {
+        there: "friend"
+    }
+</style>`
+            );
+        });
+
+        it('style block var plain', async () => {
+            await assertMatchesSnapshot(
+                `<style>
+    var x = "test";
+</style>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/switchStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/switchStatement.ts
new file mode 100644
index 000000000..f8e29b05f
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/switchStatement.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunSwitchStatementSuite() {
+    describe('@switch ( ... ) { ... }', () => {
+        it('Incomplete switch statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@switch');
+        });
+
+        it('Incomplete switch statement, no condition', async () => {
+            await assertMatchesSnapshot('@switch {}');
+        });
+
+        it('Incomplete switch statement, no cases', async () => {
+            await assertMatchesSnapshot('@switch (condition) {Console.WriteLine("Invalid?")}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@switch (   value  ) { case 123: var x = 123;<p>Hello World</p>break; }');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@switch (
+    await GetAValue(
+        () => true,
+        name: "Hello",
+        new {
+            Foo = false,
+        }
+)){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@switch (SomeProperty)
+{
+    case 123:
+        var x = 123;
+        <div>
+            @switch (GetAnotherValue()) {
+                case: 456
+                    <p></p>
+                break;
+            }
+        </div>
+        break;
+}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    switch (SomeProp) {
+        case 123:
+            <p></p>
+            break;
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    switch (over to better classifications)
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/tagHelperPrefixDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/tagHelperPrefixDirective.ts
new file mode 100644
index 000000000..007c80859
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/tagHelperPrefixDirective.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunTagHelperPrefixDirectiveSuite() {
+    describe('@tagHelperPrefix directive', () => {
+        it('No parameter', async () => {
+            await assertMatchesSnapshot('@tagHelperPrefix');
+        });
+
+        it('No parameter, spaced', async () => {
+            await assertMatchesSnapshot('@tagHelperPrefix                 ');
+        });
+
+        it('Incomplete parameter', async () => {
+            await assertMatchesSnapshot('@tagHelperPrefix "');
+        });
+
+        it('Unquoted parameter', async () => {
+            await assertMatchesSnapshot('@tagHelperPrefix th:');
+        });
+
+        it('Quoted parameter', async () => {
+            await assertMatchesSnapshot('@tagHelperPrefix "th:"');
+        });
+
+        it('Quoted parameter spaced', async () => {
+            await assertMatchesSnapshot('@tagHelperPrefix       "th:   "            ');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/transitions.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/transitions.ts
new file mode 100644
index 000000000..14dc0266b
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/transitions.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunTransitionsSuite() {
+    describe('Transitions', () => {
+        it('Escaped transitions', async () => {
+            await assertMatchesSnapshot('@@');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/tryStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/tryStatement.ts
new file mode 100644
index 000000000..ad10c5411
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/tryStatement.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunTryStatementSuite() {
+    describe('@try { ... } catch/finally { ... }', () => {
+        it('Incomplete try statement, no body', async () => {
+            await assertMatchesSnapshot('@try');
+        });
+
+        it('Incomplete try statement, no catch or finally', async () => {
+            await assertMatchesSnapshot('@try {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot(
+                '@try { var x = 123;<p>Hello World</p> } catch (Exception ex) {@DateTime.Now}finally{<section></section>var y = 456;}'
+            );
+        });
+
+        it('Multi line catch', async () => {
+            await assertMatchesSnapshot(
+                `@try
+{
+}
+catch (
+    InvalidOperationException
+    ex){}`
+            );
+        });
+
+        it('Multi line complex', async () => {
+            await assertMatchesSnapshot(
+                `@try
+{
+    Console.WriteLine("Invoking!");
+    <div>Invoked: @SomeMethod()</div>
+} catch (InvalidOperationExeption ex) when (ex != null)
+{
+    var x = 123;
+    <div>
+        @try {
+            <p>Error occurred</p>
+            throw;
+        } catch(Exception ex) {
+
+        } finally { <strong>In the finally</strong> }
+    </div>
+}finally{}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    try {
+        <p></p>
+    } catch(Exception ex) {
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    try not to classify this
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/usingDirective.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/usingDirective.ts
new file mode 100644
index 000000000..e05c7fecf
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/usingDirective.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunUsingDirectiveSuite() {
+    describe('@using directive', () => {
+        it('Standard using, no namespace', async () => {
+            await assertMatchesSnapshot('@using');
+        });
+
+        it('As C# local', async () => {
+            await assertMatchesSnapshot('@using.method()');
+        });
+
+        it('Standard using, no namespace spaced', async () => {
+            await assertMatchesSnapshot('@using              ');
+        });
+
+        it('Standard using', async () => {
+            await assertMatchesSnapshot('@using System.IO');
+        });
+
+        it('Standard using spaced', async () => {
+            await assertMatchesSnapshot('@using              System.IO         ');
+        });
+
+        it('Standard using, optional semicolon', async () => {
+            await assertMatchesSnapshot('@using System.IO;');
+        });
+
+        it('Static using, no namespace', async () => {
+            await assertMatchesSnapshot('@using static');
+        });
+
+        it('Static using, no namespace spaced', async () => {
+            await assertMatchesSnapshot('@using        static      ');
+        });
+
+        it('Static using', async () => {
+            await assertMatchesSnapshot('@using static System.Math');
+        });
+
+        it('Static using spaced', async () => {
+            await assertMatchesSnapshot('@using    static          System.Math         ');
+        });
+
+        it('Static using, optional semicolon', async () => {
+            await assertMatchesSnapshot('@using static System.Math;');
+        });
+
+        it('Using alias, no type', async () => {
+            await assertMatchesSnapshot('@using Something =');
+        });
+
+        it('Using alias, no type spaced', async () => {
+            await assertMatchesSnapshot('@using        Something   =    ');
+        });
+
+        it('Using alias, incomplete type, generic', async () => {
+            await assertMatchesSnapshot('@using TheTime = System.Collections.Generic.List<string');
+        });
+
+        it('Using alias', async () => {
+            await assertMatchesSnapshot('@using TheConsole = System.Console');
+        });
+
+        it('Using alias spaced', async () => {
+            await assertMatchesSnapshot('@using     TheConsole     =    System.Console   ');
+        });
+
+        it('Using alias, optional semicolon', async () => {
+            await assertMatchesSnapshot('@using TheConsole = System.Console;');
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/usingStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/usingStatement.ts
new file mode 100644
index 000000000..6cef16487
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/usingStatement.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunUsingStatementSuite() {
+    describe('@using ( ... ) { ... }', () => {
+        it('Incomplete using statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@using');
+        });
+
+        it('Incomplete using statement, no condition', async () => {
+            await assertMatchesSnapshot('@using {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@using (someDisposable) { var x = 123;<p>Hello World</p> }');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@using (
+    await GetSomeDisposableAsync(
+        () => true,
+        name: "The Good Disposable",
+        new {
+            Foo = false,
+        }
+)){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@using (SomeDisposable)
+{
+    var x = 123;
+    <div>
+        @using (GetAnotherDisposable()) {
+            <p></p>
+        }
+    </div>
+}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    using (SomeDisposable) {
+        <p></p>
+    }
+}`
+            );
+        });
+
+        it('Not in HTML', async () => {
+            await assertMatchesSnapshot(
+                `<div>
+    using (the best potatoes)
+</div>`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/whileStatement.ts b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/whileStatement.ts
new file mode 100644
index 000000000..a5bc88ce2
--- /dev/null
+++ b/test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/whileStatement.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertMatchesSnapshot } from './infrastructure/testUtilities';
+
+// See GrammarTests.test.ts for details on exporting this test suite instead of running in place.
+
+export function RunWhileStatementSuite() {
+    describe('@while ( ... ) { ... }', () => {
+        it('Incomplete while statement, no condition or body', async () => {
+            await assertMatchesSnapshot('@while');
+        });
+
+        it('Incomplete while statement, no condition', async () => {
+            await assertMatchesSnapshot('@while {}');
+        });
+
+        it('Single line', async () => {
+            await assertMatchesSnapshot('@while (   true  ) { var x = 123;<p>Hello World</p> }');
+        });
+
+        it('Multi line condition', async () => {
+            await assertMatchesSnapshot(
+                `@while (
+    await GetATruthyValue(
+        () => true,
+        name: "Hello",
+        new {
+            Foo = false,
+        }
+)){}`
+            );
+        });
+
+        it('Multi line body', async () => {
+            await assertMatchesSnapshot(
+                `@while (SomeProperty)
+{
+    var x = 123;
+    <div>
+        @while (GetAnotherValue()) {
+            <p></p>
+        }
+    </div>
+}`
+            );
+        });
+
+        it('Nested inside if', async () => {
+            await assertMatchesSnapshot(
+                `@if (true)
+{
+    while (SomeProperty {
+        <p></p>
+    }
+}`
+            );
+        });
+    });
+}
diff --git a/test/razorTests/jest.config.ts b/test/razorTests/jest.config.ts
new file mode 100644
index 000000000..1d5497c95
--- /dev/null
+++ b/test/razorTests/jest.config.ts
@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const razorTestProjectName = 'Razor Unit Tests';
+
+/**
+ * Defines a jest project configuration for Razor jest tests.
+ */
+const razorConfig: Config = {
+    ...baseProjectConfig,
+    displayName: razorTestProjectName,
+    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
+    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
+    modulePathIgnorePatterns: ['out'],
+    // Specify jest to only run tests in jest folders.
+    roots: ['<rootDir>'],
+};
+
+export default razorConfig;
diff --git a/test/runIntegrationTests.ts b/test/runIntegrationTests.ts
index f9ceb4696..8cd37b0ba 100644
--- a/test/runIntegrationTests.ts
+++ b/test/runIntegrationTests.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as jest from 'jest';
+import { Config } from '@jest/types';
 import * as cp from 'child_process';
 import * as path from 'path';
 import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath, runTests } from '@vscode/test-electron';
@@ -15,19 +17,27 @@ function getSln(workspacePath: string): string | undefined {
     return undefined;
 }
 
-async function main() {
+export async function main() {
     try {
         const vscodeExecutablePath = await downloadAndUnzipVSCode('stable');
         const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
 
-        cp.spawnSync(cli, [...args, '--install-extension', 'ms-dotnettools.vscode-dotnet-runtime'], {
+        console.log('Display: ' + process.env.DISPLAY);
+
+        const result = cp.spawnSync(cli, [...args, '--install-extension', 'ms-dotnettools.vscode-dotnet-runtime'], {
             encoding: 'utf-8',
             stdio: 'inherit',
         });
+        if (result.error) {
+            throw new Error(`Failed to install the runtime extension: ${result.error}`);
+        }
 
         // The folder containing the Extension Manifest package.json
         // Passed to `--extensionDevelopmentPath`
-        const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+        const extensionDevelopmentPath = process.env.CODE_EXTENSIONS_PATH;
+        if (!extensionDevelopmentPath) {
+            throw new Error('Environment variable CODE_EXTENSIONS_PATH is empty');
+        }
 
         // The path to the extension test runner script
         // Passed to --extensionTestsPath
@@ -64,7 +74,8 @@ async function main() {
         const exitCode = await runTests({
             extensionDevelopmentPath,
             extensionTestsPath,
-            launchArgs: [workspacePath, '-n', '--verbose'],
+            // Launch with info logging as anything else is way too verbose and will hide test results.
+            launchArgs: [workspacePath, '-n', '--log', 'info'],
             extensionTestsEnv: process.env,
         });
 
@@ -76,4 +87,36 @@ async function main() {
     }
 }
 
-main();
+export async function runIntegrationTests(projectName: string) {
+    const repoRoot = process.env.CODE_EXTENSIONS_PATH;
+    if (!repoRoot) {
+        throw new Error('CODE_EXTENSIONS_PATH not set.');
+    }
+
+    const jestConfigPath = path.join(repoRoot, 'jest.config.ts');
+    const jestConfig = {
+        config: jestConfigPath,
+        selectProjects: [projectName],
+        // Since we're running tests in the actual vscode process we have to run them serially.
+        runInBand: true,
+        // Timeout cannot be overriden in the jest config file, so override here.
+        testTimeout: 120000,
+        verbose: true,
+    } as Config.Argv;
+
+    let filter: string;
+    if (process.env.TEST_FILE_FILTER) {
+        // If we have just a file, run that with runTestsByPath.
+        jestConfig.runTestsByPath = true;
+        jestConfig.testMatch = [process.env.TEST_FILE_FILTER];
+        filter = process.env.TEST_FILE_FILTER;
+    } else {
+        filter = projectName;
+    }
+
+    const { results } = await jest.runCLI(jestConfig, [filter]);
+
+    if (!results.success) {
+        throw new Error('Tests failed.');
+    }
+}
diff --git a/test/testRunner.ts b/test/testRunner.ts
deleted file mode 100644
index df739c98e..000000000
--- a/test/testRunner.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob-promise';
-import * as tty from 'tty';
-
-// Linux: prevent a weird NPE when mocha on Linux requires the window size from the TTY
-// Since we are not running in a tty environment, we just implement the method statically
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-tty.getWindowSize = function () {
-    return [80, 75];
-};
-
-export async function run(testsRoot: string, options?: Mocha.MochaOptions) {
-    options ??= {
-        ui: 'tdd',
-        useColors: true,
-        retries: 2,
-    };
-
-    const mocha = new Mocha(options);
-    // Glob test files
-    const files = await glob('**/**.test.js', { cwd: testsRoot });
-
-    // Fill into Mocha
-    files.forEach((file) => mocha.addFile(path.join(testsRoot, file)));
-
-    return new Promise<number>((resolve) => {
-        mocha.run(resolve);
-    }).then((failures) => {
-        if (failures > 0) {
-            throw new Error(`${failures} tests failed.`);
-        }
-    });
-}
diff --git a/test/unitTests/configurationMiddleware.test.ts b/test/unitTests/configurationMiddleware.test.ts
index 35fdef806..530328d0a 100644
--- a/test/unitTests/configurationMiddleware.test.ts
+++ b/test/unitTests/configurationMiddleware.test.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assert, expect } from 'chai';
 import { readFileSync } from 'fs';
 import { convertServerOptionNameToClientConfigurationName } from '../../src/lsptoolshost/optionNameConverter';
 import * as jestLib from '@jest/globals';
@@ -241,9 +240,9 @@ jestLib.describe('Server option name to vscode configuration name test', () => {
             `Server option name ${data.serverOption} should be converted to ${data.vsCodeConfiguration}`,
             () => {
                 const actualName = convertServerOptionNameToClientConfigurationName(data.serverOption);
-                expect(actualName).to.equal(data.vsCodeConfiguration);
+                jestLib.expect(actualName).toBe(data.vsCodeConfiguration);
                 if (data.declareInPackageJson) {
-                    assert.include(configurations, data.vsCodeConfiguration);
+                    jestLib.expect(configurations).toContain(data.vsCodeConfiguration);
                 }
             }
         );
diff --git a/test/unitTests/fakes.ts b/test/unitTests/fakes.ts
index 843cb1dc5..f9e27e951 100644
--- a/test/unitTests/fakes.ts
+++ b/test/unitTests/fakes.ts
@@ -195,7 +195,7 @@ export function getFakeVsCode(): vscodeAdapter.vscode {
                 throw new Error('Not Implemented');
             },
         },
-        version: '',
+        version: 'myVersion',
         env: {
             appName: '',
             appRoot: '',
diff --git a/test/unitTests/jest.config.ts b/test/unitTests/jest.config.ts
new file mode 100644
index 000000000..5c180704d
--- /dev/null
+++ b/test/unitTests/jest.config.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const jestUnitTestProjectName = 'Unit Tests';
+
+/**
+ * Defines a jest project configuration for unit tests.
+ */
+const unitTestConfig: Config = {
+    ...baseProjectConfig,
+    displayName: jestUnitTestProjectName,
+    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
+    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
+    modulePathIgnorePatterns: ['out'],
+    // Specify jest to only run tests in jest folders.
+    // We also have to include the __mocks__ folder.  That folder must be next to node_modules so we can't move it,
+    // but if we specify roots, jest won't automatically pick it up.  So we have to specify it here.
+    roots: ['<rootDir>', '<rootDir>../../__mocks__'],
+};
+
+export default unitTestConfig;
diff --git a/omnisharptest/omnisharpUnitTests/json.test.ts b/test/unitTests/json.test.ts
similarity index 58%
rename from omnisharptest/omnisharpUnitTests/json.test.ts
rename to test/unitTests/json.test.ts
index f982411db..99fc54a97 100644
--- a/omnisharptest/omnisharpUnitTests/json.test.ts
+++ b/test/unitTests/json.test.ts
@@ -3,13 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { should } from 'chai';
 import { tolerantParse } from '../../src/json';
+import * as jestLib from '@jest/globals';
 
-suite('JSON', () => {
-    suiteSetup(() => should());
-
-    test('no comments', () => {
+jestLib.describe('JSON', () => {
+    jestLib.test('no comments', () => {
         const text = `{
     "hello": "world"
 }`;
@@ -17,10 +15,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(text);
+        jestLib.expect(result).toEqual(text);
     });
 
-    test('no comments (minified)', () => {
+    jestLib.test('no comments (minified)', () => {
         const text = `{"hello":"world","from":"json"}`;
 
         const expected = `{
@@ -31,10 +29,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('single-line comment before JSON', () => {
+    jestLib.test('single-line comment before JSON', () => {
         const text = `// comment
 {
     "hello": "world\\"" // comment
@@ -47,10 +45,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('single-line comment on separate line', () => {
+    jestLib.test('single-line comment on separate line', () => {
         const text = `{
     // comment
     "hello": "world"
@@ -63,10 +61,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('single-line comment at end of line', () => {
+    jestLib.test('single-line comment at end of line', () => {
         const text = `{
     "hello": "world" // comment
 }`;
@@ -78,10 +76,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('single-line comment at end of text', () => {
+    jestLib.test('single-line comment at end of text', () => {
         const text = `{
     "hello": "world"
 } // comment`;
@@ -93,10 +91,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('ignore single-line comment inside string', () => {
+    jestLib.test('ignore single-line comment inside string', () => {
         const text = `{
     "hello": "world // comment"
 }`;
@@ -104,10 +102,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(text);
+        jestLib.expect(result).toEqual(text);
     });
 
-    test('single-line comment after string with escaped double quote', () => {
+    jestLib.test('single-line comment after string with escaped double quote', () => {
         const text = `{
     "hello": "world\\"" // comment
 }`;
@@ -119,10 +117,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('multi-line comment at start of text', () => {
+    jestLib.test('multi-line comment at start of text', () => {
         const text = `/**/{
     "hello": "world"
 }`;
@@ -134,10 +132,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('comment out key/value pair', () => {
+    jestLib.test('comment out key/value pair', () => {
         const text = `{
     /*"hello": "world"*/
     "from": "json"
@@ -150,10 +148,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('multi-line comment at end of text', () => {
+    jestLib.test('multi-line comment at end of text', () => {
         const text = `{
     "hello": "world"
 }/**/`;
@@ -165,10 +163,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('ignore multi-line comment inside string', () => {
+    jestLib.test('ignore multi-line comment inside string', () => {
         const text = `{
     "hello": "wo/**/rld"
 }`;
@@ -180,10 +178,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('ignore BOM', () => {
+    jestLib.test('ignore BOM', () => {
         const text = `\uFEFF{
     "hello": "world"
 }`;
@@ -195,10 +193,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('ignore trailing comma in object member list', () => {
+    jestLib.test('ignore trailing comma in object member list', () => {
         const text = `{
     "obj": {
         "hello": "world",
@@ -216,10 +214,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('ignore trailing comma in array element list', () => {
+    jestLib.test('ignore trailing comma in array element list', () => {
         const text = `{
     "array": [
         "element1",
@@ -237,10 +235,10 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
     });
 
-    test('ignore trailing comma in object member list with leading and trailing whitespace', () => {
+    jestLib.test('ignore trailing comma in object member list with leading and trailing whitespace', () => {
         const text = `{
     "obj": { "a" : 1 , }
 }`;
@@ -254,6 +252,41 @@ suite('JSON', () => {
         const json = tolerantParse(text);
         const result = JSON.stringify(json, null, 4);
 
-        result.should.equal(expected);
+        jestLib.expect(result).toEqual(expected);
+    });
+
+    jestLib.test('single-line comments in multiple locations', () => {
+        const text = `
+// This comment should be allowed.
+{
+    // This comment should be allowed.
+    "version": "2.0.0",         // This comment should be allowed.
+    "tasks": [
+        // This comment should be allowed.
+        {
+            "label":   "foo",       // This comment should be allowed.
+            "type":    "shell",
+            "command": "true",
+            // This comment should be allowed.
+        },
+    ],
+}
+// This comment should be allowed.`;
+
+        const expected = `{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "foo",
+            "type": "shell",
+            "command": "true"
+        }
+    ]
+}`;
+
+        const json = tolerantParse(text);
+        const result = JSON.stringify(json, null, 4);
+
+        jestLib.expect(result).toEqual(expected);
     });
 });
diff --git a/test/unitTests/languageServerConfigChangeObserver.test.ts b/test/unitTests/languageServerConfigChangeObserver.test.ts
index 111b6342d..d9cc72e76 100644
--- a/test/unitTests/languageServerConfigChangeObserver.test.ts
+++ b/test/unitTests/languageServerConfigChangeObserver.test.ts
@@ -5,25 +5,24 @@
 
 import { timeout } from 'rxjs/operators';
 import { from as observableFrom, Subject, BehaviorSubject } from 'rxjs';
-import { Options } from '../../src/shared/options';
 import { registerLanguageServerOptionChanges } from '../../src/lsptoolshost/optionChanges';
 
 import * as jestLib from '@jest/globals';
 import * as vscode from 'vscode';
 import { getVSCodeWithConfig, updateConfig } from './fakes';
 
-jestLib.describe('OmniSharpConfigChangeObserver', () => {
+jestLib.describe('Option changes observer', () => {
     let doClickOk: () => void;
     let doClickCancel: () => void;
     let signalCommandDone: () => void;
     let commandDone: Promise<void> | undefined;
     let infoMessage: string | undefined;
     let invokedCommand: string | undefined;
-    let optionObservable: Subject<Options>;
+    let optionObservable: Subject<void>;
 
     jestLib.beforeEach(() => {
         resetMocks();
-        optionObservable = new BehaviorSubject<Options>(Options.Read(vscode));
+        optionObservable = new BehaviorSubject<void>(undefined);
         infoMessage = undefined;
         invokedCommand = undefined;
         commandDone = new Promise<void>((resolve) => {
@@ -37,13 +36,14 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
     [
         { config: 'dotnet', section: 'server.documentSelector', value: ['other'] },
         { config: 'dotnet', section: 'server.trace', value: 'trace' },
+        { config: 'dotnet', section: 'preferCSharpExtension', value: true },
     ].forEach((elem) => {
-        jestLib.describe(`When the ${elem.config} ${elem.section} changes`, () => {
+        jestLib.describe(`When the ${elem.config}.${elem.section} changes`, () => {
             jestLib.beforeEach(() => {
                 jestLib.expect(infoMessage).toBe(undefined);
                 jestLib.expect(invokedCommand).toBe(undefined);
                 updateConfig(vscode, elem.config, elem.section, elem.value);
-                optionObservable.next(Options.Read(vscode));
+                optionObservable.next();
             });
 
             jestLib.test(`The information message is shown`, async () => {
@@ -77,12 +77,12 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
     });
 
     [{ config: 'dotnet', section: 'server.useOmnisharp', value: true }].forEach((elem) => {
-        jestLib.describe(`When the ${elem.config} ${elem.section} changes`, () => {
+        jestLib.describe(`When the ${elem.config}.${elem.section} changes`, () => {
             jestLib.beforeEach(() => {
                 jestLib.expect(infoMessage).toBe(undefined);
                 jestLib.expect(invokedCommand).toBe(undefined);
                 updateConfig(vscode, elem.config, elem.section, elem.value);
-                optionObservable.next(Options.Read(vscode));
+                optionObservable.next();
             });
 
             jestLib.test(`The information message is shown`, async () => {
@@ -125,7 +125,7 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
                 jestLib.expect(infoMessage).toBe(undefined);
                 jestLib.expect(invokedCommand).toBe(undefined);
                 updateConfig(vscode, elem.config, elem.section, elem.value);
-                optionObservable.next(Options.Read(vscode));
+                optionObservable.next();
                 jestLib.expect(infoMessage).toBe(undefined);
             }
         );
@@ -141,7 +141,7 @@ jestLib.describe('OmniSharpConfigChangeObserver', () => {
             jestLib.expect(infoMessage).toBe(undefined);
             jestLib.expect(invokedCommand).toBe(undefined);
             updateConfig(vscode, elem.config, elem.section, elem.value);
-            optionObservable.next(Options.Read(vscode));
+            optionObservable.next();
             jestLib.expect(infoMessage).toBe(undefined);
         });
     });
diff --git a/test/unitTests/migrateOptions.test.ts b/test/unitTests/migrateOptions.test.ts
index 413c59f99..c5ef26e63 100644
--- a/test/unitTests/migrateOptions.test.ts
+++ b/test/unitTests/migrateOptions.test.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { readFileSync } from 'fs';
-import { assert } from 'chai';
 import { migrateOptions } from '../../src/shared/migrateOptions';
 import * as jestLib from '@jest/globals';
 
@@ -15,7 +14,7 @@ jestLib.describe('Migrate configuration should in package.json', () => {
 
     migrateOptions.forEach((data) => {
         jestLib.test(`Should have ${data.roslynOption} in package.json`, () => {
-            assert.include(configurations, data.roslynOption);
+            jestLib.expect(configurations).toContain(data.roslynOption);
         });
     });
 });
diff --git a/test/unitTests/packageNlsJson.test.ts b/test/unitTests/packageNlsJson.test.ts
new file mode 100644
index 000000000..cb7c1877e
--- /dev/null
+++ b/test/unitTests/packageNlsJson.test.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFileSync } from 'fs';
+import * as jestLib from '@jest/globals';
+
+jestLib.describe('package.nls.json validation tests', () => {
+    const langCodes = ['cs', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'pl', 'pt-br', 'ru', 'tr', 'zh-cn', 'zh-tw'];
+    const keysWithURLExamples = [
+        'generateOptionsSchema.symbolOptions.searchPaths.description',
+        'generateOptionsSchema.symbolOptions.searchMicrosoftSymbolServer.description',
+        'generateOptionsSchema.symbolOptions.searchNuGetOrgSymbolServer.description',
+    ];
+
+    langCodes.forEach((lang) => {
+        jestLib.test(`Verify \\u200b exists in example URLs in package.nls.${lang}.json`, () => {
+            const filename = `package.nls.${lang}.json`;
+            const packageNLSJson = JSON.parse(readFileSync(filename).toString());
+            for (const key of keysWithURLExamples) {
+                try {
+                    jestLib.expect(packageNLSJson[key]).toContain('\u200b');
+                } catch (e) {
+                    throw "Missing \\u200b in example urls, please run 'gulp fixLocURLs' and check in those changes.";
+                }
+            }
+        });
+    });
+});
diff --git a/tsconfig.json b/tsconfig.json
index 52123e7ab..b999e0341 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,6 +8,7 @@
         ],
         "sourceMap": true,
         "moduleResolution": "node",
+        "moduleDetection": "force",
         "strict": true,
         "forceConsistentCasingInFileNames": true,
         "skipLibCheck": true,
@@ -23,5 +24,6 @@
         "typings",
         "__mocks__",
         "jest.config.ts",
+        "baseJestConfig.ts",
     ]
 }
diff --git a/version.json b/version.json
index 200063a18..06248f73f 100644
--- a/version.json
+++ b/version.json
@@ -1,9 +1,10 @@
 {
 	"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-	"version": "2.0",
+	"version": "2.7",
 	"publicReleaseRefSpec": [
 		"^refs/heads/release$",
-		"^refs/heads/main$"
+		"^refs/heads/main$",
+		"^refs/heads/patch/.*$"
 	],
 	"cloudBuild": {
 		"buildNumber": {