Skip to content

Commit 5055dbe

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/snippetTextEdit
2 parents 618b587 + 6b5f78e commit 5055dbe

File tree

177 files changed

+3860
-2324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+3860
-2324
lines changed

‎build/gulpfile.reh.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,13 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
311311
);
312312
} else if (platform === 'linux' || platform === 'alpine' || platform === 'darwin') {
313313
result = es.merge(result,
314-
gulp.src('resources/server/bin/remote-cli/code.sh', { base: '.' })
314+
gulp.src(`resources/server/bin/remote-cli/${platform === 'darwin' ? 'code-darwin.sh' : 'code-linux.sh'}`, { base: '.' })
315315
.pipe(replace('@@VERSION@@', version))
316316
.pipe(replace('@@COMMIT@@', commit))
317317
.pipe(replace('@@APPNAME@@', product.applicationName))
318318
.pipe(rename(`bin/remote-cli/${product.applicationName}`))
319319
.pipe(util.setExecutableBit()),
320-
gulp.src('resources/server/bin/helpers/browser.sh', { base: '.' })
320+
gulp.src(`resources/server/bin/helpers/${platform === 'darwin' ? 'browser-darwin.sh' : 'browser-linux.sh'}`, { base: '.' })
321321
.pipe(replace('@@VERSION@@', version))
322322
.pipe(replace('@@COMMIT@@', commit))
323323
.pipe(replace('@@APPNAME@@', product.applicationName))

‎extensions/git/src/git.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,16 @@ export class Git {
531531

532532
stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
533533
options = assign({ cwd }, options || {});
534-
return this.spawn(args, options);
534+
const child = this.spawn(args, options);
535+
536+
if (options.log !== false) {
537+
const startTime = Date.now();
538+
child.on('exit', (_) => {
539+
this.log(`> git ${args.join(' ')} [${Date.now() - startTime}ms]\n`);
540+
});
541+
}
542+
543+
return child;
535544
}
536545

537546
private async _exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {

‎extensions/latex/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "jlelong/vscode-latex-basics",
88
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
9-
"commitHash": "4f330febaf180ed7faf3aa228d38611d8b5adbf5"
9+
"commitHash": "4ef954d31faccf96545d736a5ccc0e09d8109f12"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/latex/latex-language-configuration.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,15 @@
106106
"increaseIndentPattern": "\\\\begin{(?!document)([^}]*)}(?!.*\\\\end{\\1})",
107107
"decreaseIndentPattern": "^\\s*\\\\end{(?!document)"
108108
},
109-
"autoCloseBefore": ";:.,=}])>\\` \n\t$",
110-
"wordPattern": "([^\\s`'\"~_!?|$#@%^&*\\-=+;:,.<>(){}[\\]\\/]+)"
109+
"folding": {
110+
"markers": {
111+
"start": "^\\s*%?\\s*(region|\\\\begingroup)\\b",
112+
"end": "^\\s*%?\\s*(endregion|\\\\endgroup)\\b"
113+
}
114+
},
115+
"autoCloseBefore": ";:.,={}])>\\` \n\t$",
116+
"wordPattern": {
117+
"pattern": "(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark}){2,}",
118+
"flags": "u"
119+
}
111120
}

‎extensions/latex/markdown-latex-combined-language-configuration.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,16 @@
111111
"increaseIndentPattern": "\\\\begin{(?!document)([^}]*)}(?!.*\\\\end{\\1})",
112112
"decreaseIndentPattern": "^\\s*\\\\end{(?!document)"
113113
},
114-
"autoCloseBefore": ";:.,=}])>\\` \n\t$",
115-
"wordPattern": "([^\\s`'\"~_!?|$#@%^&*\\-=+;:,.<>(){}[\\]\\/]+)",
116114
"folding": {
117115
"offSide": true,
118116
"markers": {
119117
"start": "^\\s*<!--\\s*#?region\\b.*-->",
120118
"end": "^\\s*<!--\\s*#?endregion\\b.*-->"
121119
}
120+
},
121+
"autoCloseBefore": ";:.,={}])>\\` \n\t$",
122+
"wordPattern": {
123+
"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",
124+
"flags": "u"
122125
}
123126
}

‎extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jlelong/vscode-latex-basics/commit/5f26a6daf70352a6f3f40b3b4437a605f5d954ee",
7+
"version": "https://github.com/jlelong/vscode-latex-basics/commit/4ef954d31faccf96545d736a5ccc0e09d8109f12",
88
"name": "Markdown",
99
"scopeName": "text.tex.markdown_latex_combined",
1010
"patterns": [
@@ -2442,6 +2442,9 @@
24422442
{
24432443
"include": "#raw"
24442444
},
2445+
{
2446+
"include": "#strikethrough"
2447+
},
24452448
{
24462449
"include": "#escape"
24472450
},
@@ -2537,6 +2540,9 @@
25372540
},
25382541
{
25392542
"include": "#link-ref-shortcut"
2543+
},
2544+
{
2545+
"include": "#strikethrough"
25402546
}
25412547
]
25422548
},
@@ -2688,6 +2694,9 @@
26882694
},
26892695
{
26902696
"include": "#link-ref-shortcut"
2697+
},
2698+
{
2699+
"include": "#strikethrough"
26912700
}
26922701
]
26932702
},
@@ -2847,8 +2856,76 @@
28472856
"name": "punctuation.definition.raw.markdown"
28482857
}
28492858
},
2850-
"match": "(`+)([^`]|(?!(?<!`)\\1(?!`))`)*+(\\1)",
2859+
"match": "(`+)((?:[^`]|(?!(?<!`)\\1(?!`))`)*+)(\\1)",
28512860
"name": "markup.inline.raw.string.markdown"
2861+
},
2862+
"strikethrough": {
2863+
"captures": {
2864+
"1": {
2865+
"name": "punctuation.definition.strikethrough.markdown"
2866+
},
2867+
"2": {
2868+
"patterns": [
2869+
{
2870+
"applyEndPatternLast": 1,
2871+
"begin": "(?=<[^>]*?>)",
2872+
"end": "(?<=>)",
2873+
"patterns": [
2874+
{
2875+
"include": "text.html.derivative"
2876+
}
2877+
]
2878+
},
2879+
{
2880+
"include": "#escape"
2881+
},
2882+
{
2883+
"include": "#ampersand"
2884+
},
2885+
{
2886+
"include": "#bracket"
2887+
},
2888+
{
2889+
"include": "#raw"
2890+
},
2891+
{
2892+
"include": "#bold"
2893+
},
2894+
{
2895+
"include": "#italic"
2896+
},
2897+
{
2898+
"include": "#image-inline"
2899+
},
2900+
{
2901+
"include": "#link-inline"
2902+
},
2903+
{
2904+
"include": "#link-inet"
2905+
},
2906+
{
2907+
"include": "#link-email"
2908+
},
2909+
{
2910+
"include": "#image-ref"
2911+
},
2912+
{
2913+
"include": "#link-ref-literal"
2914+
},
2915+
{
2916+
"include": "#link-ref"
2917+
},
2918+
{
2919+
"include": "#link-ref-shortcut"
2920+
}
2921+
]
2922+
},
2923+
"3": {
2924+
"name": "punctuation.definition.strikethrough.markdown"
2925+
}
2926+
},
2927+
"match": "(~+)((?:[^~]|(?!(?<!~)\\1(?!~))~)*+)(\\1)",
2928+
"name": "markup.strikethrough.markdown"
28522929
}
28532930
}
28542931
}

‎extensions/markdown-language-features/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function registerMarkdownLanguageFeatures(
6767
vscode.languages.registerFoldingRangeProvider(selector, new MdFoldingProvider(engine)),
6868
vscode.languages.registerSelectionRangeProvider(selector, new MdSmartSelect(engine)),
6969
vscode.languages.registerWorkspaceSymbolProvider(new MdWorkspaceSymbolProvider(symbolProvider, workspaceContents)),
70-
vscode.languages.registerReferenceProvider(selector, new MdReferencesProvider(linkProvider, workspaceContents, engine)),
70+
vscode.languages.registerReferenceProvider(selector, new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier)),
7171
MdPathCompletionProvider.register(selector, engine, linkProvider),
7272
);
7373
}

0 commit comments

Comments
 (0)