diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json index dd3fed2bafa..571bab55392 100644 --- a/extensions/latex/cgmanifest.json +++ b/extensions/latex/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "jlelong/vscode-latex-basics", "repositoryUrl": "https://github.com/jlelong/vscode-latex-basics", - "commitHash": "4f330febaf180ed7faf3aa228d38611d8b5adbf5" + "commitHash": "4ef954d31faccf96545d736a5ccc0e09d8109f12" } }, "license": "MIT", diff --git a/extensions/latex/latex-language-configuration.json b/extensions/latex/latex-language-configuration.json index 8613e8907b9..095de001ecd 100644 --- a/extensions/latex/latex-language-configuration.json +++ b/extensions/latex/latex-language-configuration.json @@ -106,6 +106,15 @@ "increaseIndentPattern": "\\\\begin{(?!document)([^}]*)}(?!.*\\\\end{\\1})", "decreaseIndentPattern": "^\\s*\\\\end{(?!document)" }, - "autoCloseBefore": ";:.,=}])>\\` \n\t$", - "wordPattern": "([^\\s`'\"~_!?|$#@%^&*\\-=+;:,.<>(){}[\\]\\/]+)" + "folding": { + "markers": { + "start": "^\\s*%?\\s*(region|\\\\begingroup)\\b", + "end": "^\\s*%?\\s*(endregion|\\\\endgroup)\\b" + } + }, + "autoCloseBefore": ";:.,={}])>\\` \n\t$", + "wordPattern": { + "pattern": "(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark}){2,}", + "flags": "u" + } } diff --git a/extensions/latex/markdown-latex-combined-language-configuration.json b/extensions/latex/markdown-latex-combined-language-configuration.json index a42a4989a92..16265548b16 100644 --- a/extensions/latex/markdown-latex-combined-language-configuration.json +++ b/extensions/latex/markdown-latex-combined-language-configuration.json @@ -111,13 +111,16 @@ "increaseIndentPattern": "\\\\begin{(?!document)([^}]*)}(?!.*\\\\end{\\1})", "decreaseIndentPattern": "^\\s*\\\\end{(?!document)" }, - "autoCloseBefore": ";:.,=}])>\\` \n\t$", - "wordPattern": "([^\\s`'\"~_!?|$#@%^&*\\-=+;:,.<>(){}[\\]\\/]+)", "folding": { "offSide": true, "markers": { "start": "^\\s*", "end": "^\\s*" } + }, + "autoCloseBefore": ";:.,={}])>\\` \n\t$", + "wordPattern": { + "pattern": "([*_]{1,2})?(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark})(((\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark})|[_])?(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark}))*\\1", + "flags": "u" } } diff --git a/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json b/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json index 6c9720e38bf..6a1085934f1 100644 --- a/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json +++ b/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json @@ -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/jlelong/vscode-latex-basics/commit/5f26a6daf70352a6f3f40b3b4437a605f5d954ee", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/4ef954d31faccf96545d736a5ccc0e09d8109f12", "name": "Markdown", "scopeName": "text.tex.markdown_latex_combined", "patterns": [ @@ -2442,6 +2442,9 @@ { "include": "#raw" }, + { + "include": "#strikethrough" + }, { "include": "#escape" }, @@ -2537,6 +2540,9 @@ }, { "include": "#link-ref-shortcut" + }, + { + "include": "#strikethrough" } ] }, @@ -2688,6 +2694,9 @@ }, { "include": "#link-ref-shortcut" + }, + { + "include": "#strikethrough" } ] }, @@ -2847,8 +2856,76 @@ "name": "punctuation.definition.raw.markdown" } }, - "match": "(`+)([^`]|(?!(?]*?>)", + "end": "(?<=>)", + "patterns": [ + { + "include": "text.html.derivative" + } + ] + }, + { + "include": "#escape" + }, + { + "include": "#ampersand" + }, + { + "include": "#bracket" + }, + { + "include": "#raw" + }, + { + "include": "#bold" + }, + { + "include": "#italic" + }, + { + "include": "#image-inline" + }, + { + "include": "#link-inline" + }, + { + "include": "#link-inet" + }, + { + "include": "#link-email" + }, + { + "include": "#image-ref" + }, + { + "include": "#link-ref-literal" + }, + { + "include": "#link-ref" + }, + { + "include": "#link-ref-shortcut" + } + ] + }, + "3": { + "name": "punctuation.definition.strikethrough.markdown" + } + }, + "match": "(~+)((?:[^~]|(?!(?