Merge pull request #7074 from dibarbet/merge_main

Merge main into prerelease

.vscodeignore

@@ -52,5 +52,8 @@ webpack.config.js
 !src/razor/language-configuration.json
 !src/razor/syntaxes/*
 
+!src/xaml/language-configuration.json
+!src/xaml/syntaxes/*
+
 +RuntimeLicenses/dependencies/*
 coreclr-debug/install.log

CHANGELOG.md

@@ -4,6 +4,11 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* Update Roslyn to 4.11.0-1.24226.4 (PR: [#7069](https://github.com/dotnet/vscode-csharp/pull/7069))
+  * Separate document diagnostics into multiple buckets to improve diagnostics performance (PR: [#73073](https://github.com/dotnet/roslyn/pull/73073))
+  * Improve performance of diagnostics when analysis is set to fullSolution (PR: [#73201](https://github.com/dotnet/roslyn/pull/73201))
+  * updated Telemetry to 17.11.8 and Utilities.Internal to 16.3.73 (PR: [#73107](https://github.com/dotnet/roslyn/pull/73107))
+  * Fix issue where file watchers for Razor documents were not created (PR: [#73077](https://github.com/dotnet/roslyn/pull/73077))
 * Upgrade Debugger for 2.19.18 Release (PR: [#7060](https://github.com/dotnet/vscode-csharp/pull/7060))
 * Textmate: fix Razor expression classification inside of HTML tags using injection (PR: [#7055](https://github.com/dotnet/vscode-csharp/pull/7055))
 * Textmate: fix Razor expression classification inside of HTML tags (PR: [#7051](https://github.com/dotnet/vscode-csharp/pull/7051))

package.json

@@ -37,7 +37,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.11.0-1.24209.10",
+    "roslyn": "4.11.0-1.24226.4",
     "omniSharp": "1.39.11",
     "razor": "7.0.0-preview.24178.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
@@ -5590,6 +5590,16 @@
         "aliases": [
           "ASP.NET Razor"
         ]
+      },
+      {
+        "id": "xaml",
+        "extensions": [
+          ".xaml"
+        ],
+        "configuration": "./src/xaml/language-configuration.json",
+        "aliases": [
+          "XAML"
+        ]
       }
     ],
     "grammars": [
@@ -5600,6 +5610,11 @@
         "unbalancedBracketScopes": [
           "text.aspnetcorerazor"
         ]
+      },
+      {
+        "language": "xaml",
+        "scopeName": "source.xaml",
+        "path": "./src/xaml/syntaxes/xaml.tmLanguage.json"
       }
     ],
     "menus": {

src/xaml/language-configuration.json

@@ -0,0 +1,46 @@
+{
+    "comments": {
+      "blockComment": [ "<!--", "-->" ]
+    },
+    "brackets": [
+      [ "<", ">" ],
+      [ "{", "}" ]
+    ],
+    "autoClosingPairs": [
+      {
+        "open": "{",
+        "close": "}"
+      },
+      {
+        "open": "'",
+        "close": "'",
+        "notIn": [ "string", "comment" ]
+      },
+      {
+        "open": "\"",
+        "close": "\"",
+        "notIn": [ "string", "comment" ]
+      },
+      {
+        "open": "<!--",
+        "close": "-->",
+        "notIn": [ "string" ]
+      },
+      {
+        "open": "<![CDATA[",
+        "close": "]]>",
+        "notIn": [ "string" ]
+      },
+      {
+        "open": "<?",
+        "close": "?>",
+        "notIn": [ "string" ]
+      }
+    ],
+    "autoCloseBefore": "}/>\"' \r\n\t",
+    "surroundingPairs": [
+      [ "{", "}" ],
+      [ "'", "'" ],
+      [ "\"", "\"" ]
+    ]
+  }