Merge branch 'Microsoft/master' into update-css-intellisense

# Conflicts: # src/vs/languages/html/common/htmlTags.ts
2026-05-01 14:01:38 +01:00 · 2015-12-08 17:03:17 -08:00
parent db6f0f960e
commit 23db8835f5
504 changed files with 30211 additions and 27525 deletions
--- a/extensions/fsharp/syntaxes/fsharp.json
+++ b/extensions/fsharp/syntaxes/fsharp.json
@@ -96,7 +96,7 @@
            "patterns": [
                {
                    "name": "comment.block.fsharp",
-                    "begin": "(\\(\\*)",
+                    "begin": "(\\(\\*(?!\\)))",
                    "end": "(\\*\\))",
                    "beginCaptures": {
                        "1": {