Skip to content

Commit 8cd23cf

Browse files
aeschliaeschli
committed
Merge branch 'master' of https://github.com/microsoft/vscode 
2 parents 5069ddc + e38c2d2 commit 8cd23cf

108 files changed

Lines changed: 1401 additions & 772 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.

‎.vscode/launch.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
"env": {
201201
"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
202202
},
203+
"cleanUp": "wholeBrowser",
203204
"breakOnLoad": false,
204205
"urlFilter": "*workbench.html*",
205206
"runtimeArgs": [

‎.vscode/notebooks/my-work.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"kind": 2,
2222
"language": "github-issues",
23-
"value": "$repos $milestone assignee:@me is:open\n",
23+
"value": "$repos $milestone assignee:@me is:open",
2424
"editable": false
2525
},
2626
{

‎.vscode/notebooks/verification.github-issues‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
[
2+
{
3+
"kind": 1,
4+
"language": "markdown",
5+
"value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. ",
6+
"editable": true
7+
},
8+
{
9+
"kind": 1,
10+
"language": "markdown",
11+
"value": "#### Config: update list of `repos` and the `milestone`",
12+
"editable": true
13+
},
14+
{
15+
"kind": 2,
16+
"language": "github-issues",
17+
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"June 2020\"",
18+
"editable": true
19+
},
20+
{
21+
"kind": 1,
22+
"language": "markdown",
23+
"value": "### Bugs You Filed",
24+
"editable": true
25+
},
26+
{
27+
"kind": 2,
28+
"language": "github-issues",
29+
"value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me",
30+
"editable": false
31+
},
32+
{
33+
"kind": 1,
34+
"language": "markdown",
35+
"value": "### Bugs From Outside",
36+
"editable": true
37+
},
38+
{
39+
"kind": 2,
40+
"language": "github-issues",
41+
"value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
42+
"editable": false
43+
}
44+
]

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const vscodeResources = [
6464
'out-build/paths.js',
6565
'out-build/vs/**/*.{svg,png,html}',
6666
'!out-build/vs/code/browser/**/*.html',
67+
'!out-build/vs/editor/standalone/**/*.svg',
6768
'out-build/vs/base/common/performance.js',
6869
'out-build/vs/base/node/languagePacks.js',
6970
'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',

‎build/npm/postinstall.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ yarnInstall('test/automation'); // node modules required for smoketest
7373
yarnInstall('test/smoke'); // node modules required for smoketest
7474
yarnInstall('test/integration/browser'); // node modules required for integration
7575
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
76+
77+
cp.execSync('git config pull.rebase true');

‎cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
"git": {
534534
"name": "ripgrep",
535535
"repositoryUrl": "https://github.com/BurntSushi/ripgrep",
536-
"commitHash": "8a7db1a918e969b85cd933d8ed9fa5285b281ba4"
536+
"commitHash": "973de50c9ef451da2cfcdfa86f2b2711d8d6ff48"
537537
}
538538
},
539539
"isOnlyProductionDependency": true,

‎extensions/git/src/api/extension.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Model } from '../model';
77
import { GitExtension, Repository, API } from './git';
88
import { ApiRepository, ApiImpl } from './api1';
99
import { Event, EventEmitter } from 'vscode';
10-
import { latchEvent } from '../util';
1110

1211
export function deprecated(_target: any, key: string, descriptor: any): void {
1312
if (typeof descriptor.value !== 'function') {
@@ -26,14 +25,20 @@ export class GitExtensionImpl implements GitExtension {
2625
enabled: boolean = false;
2726

2827
private _onDidChangeEnablement = new EventEmitter<boolean>();
29-
readonly onDidChangeEnablement: Event<boolean> = latchEvent(this._onDidChangeEnablement.event);
28+
readonly onDidChangeEnablement: Event<boolean> = this._onDidChangeEnablement.event;
3029

3130
private _model: Model | undefined = undefined;
3231

3332
set model(model: Model | undefined) {
3433
this._model = model;
3534

36-
this.enabled = !!model;
35+
const enabled = !!model;
36+
37+
if (this.enabled === enabled) {
38+
return;
39+
}
40+
41+
this.enabled = enabled;
3742
this._onDidChangeEnablement.fire(this.enabled);
3843
}
3944

@@ -73,4 +78,4 @@ export class GitExtensionImpl implements GitExtension {
7378

7479
return new ApiImpl(this._model);
7580
}
76-
}
81+
}

‎extensions/git/src/main.ts‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export async function activate(context: ExtensionContext): Promise<GitExtension>
175175
return result;
176176
}
177177

178-
async function checkGitVersion(info: IGit): Promise<void> {
178+
async function checkGitv1(info: IGit): Promise<void> {
179179
const config = workspace.getConfiguration('git');
180180
const shouldIgnore = config.get<boolean>('ignoreLegacyWarning') === true;
181181

@@ -202,3 +202,27 @@ async function checkGitVersion(info: IGit): Promise<void> {
202202
await config.update('ignoreLegacyWarning', true, true);
203203
}
204204
}
205+
206+
async function checkGitWindows(info: IGit): Promise<void> {
207+
if (!/^2\.(25|26)\./.test(info.version)) {
208+
return;
209+
}
210+
211+
const update = localize('updateGit', "Update Git");
212+
const choice = await window.showWarningMessage(
213+
localize('git2526', "There are known issues with the installed Git {0}. Please update to Git >= 2.27 for the git features to work correctly.", info.version),
214+
update
215+
);
216+
217+
if (choice === update) {
218+
commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/'));
219+
}
220+
}
221+
222+
async function checkGitVersion(info: IGit): Promise<void> {
223+
await checkGitv1(info);
224+
225+
if (process.platform === 'win32') {
226+
await checkGitWindows(info);
227+
}
228+
}

‎extensions/git/src/util.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Even
4444
return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
4545
}
4646

47-
export function latchEvent<T>(event: Event<T>): Event<T> {
48-
let firstCall = true;
49-
let cache: T;
50-
51-
return filterEvent(event, value => {
52-
let shouldEmit = firstCall || value !== cache;
53-
firstCall = false;
54-
cache = value;
55-
return shouldEmit;
56-
});
57-
}
58-
5947
export function anyEvent<T>(...events: Event<T>[]): Event<T> {
6048
return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
6149
const result = combinedDisposable(events.map(event => event(i => listener.call(thisArgs, i))));

‎extensions/github-browser/package.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
"main": "./out/extension.js",
2222
"contributes": {
2323
"commands": [
24+
{
25+
"command": "githubBrowser.openRepository",
26+
"title": "Open GitHub Repository...",
27+
"category": "GitHub Browser"
28+
},
2429
{
2530
"command": "githubBrowser.commit",
2631
"title": "Commit",
@@ -48,6 +53,10 @@
4853
],
4954
"menus": {
5055
"commandPalette": [
56+
{
57+
"command": "githubBrowser.openRepository",
58+
"when": "config.githubBrowser.openRepository"
59+
},
5160
{
5261
"command": "githubBrowser.commit",
5362
"when": "false"

0 commit comments

Comments
 (0)