Skip to content

[pull] main from microsoft:main #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Aug 28, 2025
Merged

[pull] main from microsoft:main #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d1cffc2
working minus internal entitlement -- needs thorough review, this is …
Yoyokrazy Aug 15, 2025
e82da93
wip
Yoyokrazy Aug 19, 2025
b492126
working, but internal = gh + msft
Yoyokrazy Aug 20, 2025
5f97596
Merge remote-tracking branch 'origin/main' into milively/internal-rep…
Yoyokrazy Aug 26, 2025
218d43b
Merge remote-tracking branch 'origin/main' into milively/internal-rep…
Yoyokrazy Aug 26, 2025
b90bf3c
mostly working with structural improvements as well. needs css polish…
Yoyokrazy Aug 26, 2025
a61bde2
polish. internal repo destination link not used atm
Yoyokrazy Aug 26, 2025
dbfc871
Highlight more languages in markdown code blocks
remcohaszing Aug 27, 2025
d5db8e6
update with internal routing options + polish
Yoyokrazy Aug 27, 2025
a0e78df
more adoptions to mcp gallery (#263708)
sandy081 Aug 27, 2025
678c2b7
Merge pull request #263703 from microsoft/milively/internal-reporting
rebornix Aug 27, 2025
bd6c2f1
distro: out with the old, in with the new (#263710)
TylerLeonhardt Aug 27, 2025
6d8ab97
Update markdown tm grammar
mjbvz Aug 27, 2025
380f286
Update build TS versions
mjbvz Aug 27, 2025
509d9f4
chatSessions supportHotReload (#263701)
joshspicer Aug 27, 2025
ede7111
Merge pull request #263550 from remcohaszing/markdown-code-blocks
mjbvz Aug 28, 2025
466be0c
Merge pull request #263716 from mjbvz/autonomous-ant
mjbvz Aug 28, 2025
682e96e
Merge pull request #263714 from mjbvz/quarrelsome-goat
mjbvz Aug 28, 2025
29cc2f2
Removing timing from local chats (#263725)
osortega Aug 28, 2025
945dc18
Fixing pluralization for chat session status (#263640)
osortega Aug 28, 2025
3aac261
bump deemon (#263573)
joaomoreno Aug 28, 2025
244c0cb
Support ordering in chat session views (#263643)
osortega Aug 28, 2025
8c1522c
Experiment two row with additional description. (#263739)
rebornix Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/markdown-basics/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"git": {
"name": "microsoft/vscode-markdown-tm-grammar",
"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
"commitHash": "548ccb91ef58ba40ac745b400d889933ccd5eb4d"
"commitHash": "0812fc4b190efc17bfed0d5b4ff918eff8e4e377"
}
},
"license": "MIT",
Expand Down
3 changes: 3 additions & 0 deletions extensions/markdown-basics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,19 @@
"meta.embedded.block.go": "go",
"meta.embedded.block.groovy": "groovy",
"meta.embedded.block.pug": "jade",
"meta.embedded.block.ignore": "ignore",
"meta.embedded.block.javascript": "javascript",
"meta.embedded.block.json": "json",
"meta.embedded.block.jsonc": "jsonc",
"meta.embedded.block.jsonl": "jsonl",
"meta.embedded.block.latex": "latex",
"meta.embedded.block.less": "less",
"meta.embedded.block.objc": "objc",
"meta.embedded.block.scss": "scss",
"meta.embedded.block.perl6": "perl6",
"meta.embedded.block.powershell": "powershell",
"meta.embedded.block.python": "python",
"meta.embedded.block.restructuredtext": "restructuredtext",
"meta.embedded.block.rust": "rust",
"meta.embedded.block.scala": "scala",
"meta.embedded.block.shellscript": "shellscript",
Expand Down
182 changes: 181 additions & 1 deletion extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"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-markdown-tm-grammar/commit/548ccb91ef58ba40ac745b400d889933ccd5eb4d",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/0812fc4b190efc17bfed0d5b4ff918eff8e4e377",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
Expand Down Expand Up @@ -959,6 +959,39 @@
}
]
},
"fenced_code_block_ignore": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(gitignore|ignore)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.ignore",
"patterns": [
{
"include": "source.ignore"
}
]
}
]
},
"fenced_code_block_js": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
Expand Down Expand Up @@ -1091,6 +1124,39 @@
}
]
},
"fenced_code_block_jsonl": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonl|jsonlines)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.jsonl",
"patterns": [
{
"include": "source.json.lines"
}
]
}
]
},
"fenced_code_block_less": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
Expand Down Expand Up @@ -1916,6 +1982,105 @@
}
]
},
"fenced_code_block_yang": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(yang)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.yang",
"patterns": [
{
"include": "source.yang"
}
]
}
]
},
"fenced_code_block_abap": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(abap)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.abap",
"patterns": [
{
"include": "source.abap"
}
]
}
]
},
"fenced_code_block_restructuredtext": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(restructuredtext|rst)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.restructuredtext",
"patterns": [
{
"include": "source.rst"
}
]
}
]
},
"fenced_code_block": {
"patterns": [
{
Expand Down Expand Up @@ -1999,6 +2164,9 @@
{
"include": "#fenced_code_block_pug"
},
{
"include": "#fenced_code_block_ignore"
},
{
"include": "#fenced_code_block_js"
},
Expand All @@ -2011,6 +2179,9 @@
{
"include": "#fenced_code_block_jsonc"
},
{
"include": "#fenced_code_block_jsonl"
},
{
"include": "#fenced_code_block_less"
},
Expand Down Expand Up @@ -2086,6 +2257,15 @@
{
"include": "#fenced_code_block_twig"
},
{
"include": "#fenced_code_block_yang"
},
{
"include": "#fenced_code_block_abap"
},
{
"include": "#fenced_code_block_restructuredtext"
},
{
"include": "#fenced_code_block_unknown"
}
Expand Down
Loading
Loading