Skip to content

Commit 0bfdfa6

Browse files
jriekenjrieken
authored
Merge branch 'master' into joh/completionOverwrite
2 parents 5d6a46c + 30886e2 commit 0bfdfa6

135 files changed

Lines changed: 1737 additions & 2260 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release/*
8+
pull_request:
9+
branches:
10+
- master
11+
- release/*
412

513
jobs:
614
linux:

‎build/npm/postinstall.js‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,11 @@ if (fs.existsSync(processTreeDts)) {
8282
}
8383

8484
function getInstalledVersion(packageName, cwd) {
85-
const opts = {};
86-
if (cwd) {
87-
opts.cwd = cwd;
88-
}
89-
90-
const result = cp.spawnSync(yarn, ['list', '--pattern', packageName], opts);
91-
const stdout = result.stdout.toString();
85+
const { stdout } = cp.spawnSync(yarn, ['list', packageName], { encoding: 'utf8', cwd });
9286
const match = stdout.match(new RegExp(packageName + '@(\\S+)'));
87+
9388
if (!match || !match[1]) {
94-
throw new Error('Unexpected output from yarn list: ' + stdout);
89+
throw new Error(`Missing ${packageName} in ${cwd}: \n${stdout}`);
9590
}
9691

9792
return match[1];
@@ -108,7 +103,7 @@ function assertSameVersionsBetweenFolders(packageName, otherFolder) {
108103

109104
// Check that modules in both the base package.json and remote/ have the same version installed
110105
const requireSameVersionsInRemote = [
111-
'xterm',
106+
// 'xterm',
112107
'xterm-addon-search',
113108
'xterm-addon-web-links',
114109
'node-pty',

‎extensions/markdown-language-features/media/index.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/markdown-language-features/preview-src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ document.addEventListener('dblclick', event => {
129129
}
130130
});
131131

132-
const passThroughLinkSchemes = ['http:', 'https:', 'mailto:', 'vscode:', 'vscode-insiders'];
132+
const passThroughLinkSchemes = ['http:', 'https:', 'mailto:', 'vscode:', 'vscode-insiders:'];
133133

134134
document.addEventListener('click', event => {
135135
if (!event) {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as path from 'path';
77
import * as vscode from 'vscode';
88
import * as nls from 'vscode-nls';
99
import { OpenDocumentLinkCommand } from '../commands/openDocumentLink';
10-
import { getUriForLinkWithKnownExternalScheme } from '../util/links';
10+
import { getUriForLinkWithKnownExternalScheme, isOfScheme, Schemes } from '../util/links';
1111

1212
const localize = nls.loadMessageBundle();
1313

@@ -18,6 +18,10 @@ function parseLink(
1818
): { uri: vscode.Uri, tooltip?: string } {
1919
const externalSchemeUri = getUriForLinkWithKnownExternalScheme(link);
2020
if (externalSchemeUri) {
21+
// Normalize VS Code links to target currently running version
22+
if (isOfScheme(Schemes.vscode, link) || isOfScheme(Schemes['vscode-insiders'], link)) {
23+
return { uri: vscode.Uri.parse(link).with({ scheme: vscode.env.uriScheme }) };
24+
}
2125
return { uri: externalSchemeUri };
2226
}
2327

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ export class MarkdownEngine {
227227
const normalizeLink = md.normalizeLink;
228228
md.normalizeLink = (link: string) => {
229229
try {
230+
// Normalize VS Code schemes to target the current version
231+
if (isOfScheme(Schemes.vscode, link) || isOfScheme(Schemes['vscode-insiders'], link)) {
232+
return normalizeLink(vscode.Uri.parse(link).with({ scheme: vscode.env.uriScheme }).toString());
233+
}
234+
230235
// If original link doesn't look like a url with a scheme, assume it must be a link to a file in workspace
231236
if (!/^[a-z\-]+:/i.test(link)) {
232237
// Use a fake scheme for parsing
@@ -261,7 +266,11 @@ export class MarkdownEngine {
261266
const validateLink = md.validateLink;
262267
md.validateLink = (link: string) => {
263268
// support file:// links
264-
return validateLink(link) || isOfScheme(Schemes.file, link) || /^data:image\/.*?;/.test(link);
269+
return validateLink(link)
270+
|| isOfScheme(Schemes.file, link)
271+
|| isOfScheme(Schemes.vscode, link)
272+
|| isOfScheme(Schemes['vscode-insiders'], link)
273+
|| /^data:image\/.*?;/.test(link);
265274
};
266275
}
267276

‎extensions/markdown-language-features/src/util/links.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const Schemes = {
1313
data: 'data:',
1414
vscode: 'vscode:',
1515
'vscode-insiders': 'vscode-insiders:',
16-
'vscode-resource': 'vscode-resource',
16+
'vscode-resource': 'vscode-resource:',
1717
};
1818

1919
const knownSchemes = [

‎extensions/npm/src/typings/refs.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
/// <reference path='../../../../src/vs/vscode.d.ts'/>
7+
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
78
/// <reference types='@types/node'/>

0 commit comments

Comments
 (0)