Skip to content

Commit f8f8f51

Browse files
GabeDeBackerGabeDeBacker
committed
Merge remote-tracking branch 'upstream/master' into user/gabrield/extensionCallbackAsTask
2 parents a756572 + 4dc0183 commit f8f8f51

180 files changed

Lines changed: 2345 additions & 1931 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/classifier.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
assignLabel: false
6464
},
6565
file-explorer: {
66-
assignees: [ bpasero ],
66+
assignees: [ isidorn ],
6767
assignLabel: false
6868
},
6969
file-glob: [],

‎build/builtInExtensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.32.1",
4+
"version": "1.32.2",
55
"repo": "https://github.com/Microsoft/vscode-node-debug",
66
"metadata": {
77
"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,9 @@ function getElectron(arch) {
214214
gulp.task(task.define('electron', task.series(util.rimraf('.build/electron'), getElectron(process.arch))));
215215
gulp.task(task.define('electron-ia32', task.series(util.rimraf('.build/electron'), getElectron('ia32'))));
216216
gulp.task(task.define('electron-x64', task.series(util.rimraf('.build/electron'), getElectron('x64'))));
217-
gulp.task(task.define('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('arm'))));
217+
gulp.task(task.define('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('armv7l'))));
218218
gulp.task(task.define('electron-arm64', task.series(util.rimraf('.build/electron'), getElectron('arm64'))));
219219

220-
221220
/**
222221
* Compute checksums for some files.
223222
*

‎build/lib/i18n.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ function createXlfFilesForExtensions() {
573573
}
574574
return _xlf;
575575
}
576-
gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`]).pipe(event_stream_1.through(function (file) {
576+
gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(event_stream_1.through(function (file) {
577577
if (file.isBuffer()) {
578578
const buffer = file.contents;
579579
const basename = path.basename(file.path);

‎build/lib/i18n.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ export function createXlfFilesForExtensions(): ThroughStream {
684684
}
685685
return _xlf;
686686
}
687-
gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`]).pipe(through(function (file: File) {
687+
gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(through(function (file: File) {
688688
if (file.isBuffer()) {
689689
const buffer: Buffer = file.contents as Buffer;
690690
const basename = path.basename(file.path);

‎extensions/configuration-editing/src/extension.ts‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ const fadedDecoration = vscode.window.createTextEditorDecorationType({
2222
let pendingLaunchJsonDecoration: NodeJS.Timer;
2323

2424
export function activate(context: vscode.ExtensionContext): void {
25-
//keybindings.json command-suggestions
26-
context.subscriptions.push(registerKeybindingsCompletions());
27-
2825
//settings.json suggestions
2926
context.subscriptions.push(registerSettingsCompletions());
3027

@@ -94,23 +91,6 @@ function autoFixSettingsJSON(willSaveEvent: vscode.TextDocumentWillSaveEvent): v
9491
vscode.workspace.applyEdit(edit));
9592
}
9693

97-
function registerKeybindingsCompletions(): vscode.Disposable {
98-
const commands = vscode.commands.getCommands(true);
99-
100-
return vscode.languages.registerCompletionItemProvider({ pattern: '**/keybindings.json' }, {
101-
102-
provideCompletionItems(document, position, _token) {
103-
const location = getLocation(document.getText(), document.offsetAt(position));
104-
if (location.path[1] === 'command') {
105-
106-
const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
107-
return commands.then(ids => ids.map(id => newSimpleCompletionItem(JSON.stringify(id), range)));
108-
}
109-
return undefined;
110-
}
111-
});
112-
}
113-
11494
function registerSettingsCompletions(): vscode.Disposable {
11595
return vscode.languages.registerCompletionItemProvider({ language: 'jsonc', pattern: '**/settings.json' }, {
11696
provideCompletionItems(document, position, token) {
@@ -207,16 +187,6 @@ function provideInstalledExtensionProposals(extensionsContent: IExtensionsConten
207187
return undefined;
208188
}
209189

210-
function newSimpleCompletionItem(label: string, range: vscode.Range, description?: string, insertText?: string): vscode.CompletionItem {
211-
const item = new vscode.CompletionItem(label);
212-
item.kind = vscode.CompletionItemKind.Value;
213-
item.detail = description;
214-
item.insertText = insertText || label;
215-
item.range = range;
216-
217-
return item;
218-
}
219-
220190
function updateLaunchJsonDecorations(editor: vscode.TextEditor | undefined): void {
221191
if (!editor || path.basename(editor.document.fileName) !== 'launch.json') {
222192
return;

‎extensions/git/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@
11821182
"number",
11831183
"null"
11841184
],
1185-
"default": null,
1185+
"default": 50,
11861186
"description": "%config.inputValidationSubjectLength%"
11871187
},
11881188
"git.detectSubmodules": {

‎extensions/git/src/git.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,14 +1456,14 @@ export class Repository {
14561456

14571457
async createStash(message?: string, includeUntracked?: boolean): Promise<void> {
14581458
try {
1459-
const args = ['stash', 'save'];
1459+
const args = ['stash', 'push'];
14601460

14611461
if (includeUntracked) {
14621462
args.push('-u');
14631463
}
14641464

14651465
if (message) {
1466-
args.push('--', message);
1466+
args.push('-m', message);
14671467
}
14681468

14691469
await this.run(args);

‎extensions/git/src/repository.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -673,20 +673,6 @@ export class Repository implements Disposable {
673673
}
674674
}
675675

676-
677-
678-
679-
680-
681-
682-
683-
684-
685-
// const subjectThreshold =
686-
687-
688-
// Math.max(config.get<number>('inputValidationLength') || 50, config.get<number>('subjectValidationLength') || 50, 0) || 50;
689-
690676
if (line.length <= threshold) {
691677
if (setting !== 'always') {
692678
return;

‎extensions/handlebars/language-configuration.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
["<!--", "-->"],
77
["<", ">"],
88
["{{", "}}"],
9+
["{{{", "}}}"],
910
["{", "}"],
1011
["(", ")"]
1112
],
@@ -19,6 +20,7 @@
1920
"surroundingPairs": [
2021
{ "open": "'", "close": "'" },
2122
{ "open": "\"", "close": "\"" },
22-
{ "open": "<", "close": ">" }
23+
{ "open": "<", "close": ">" },
24+
{ "open": "{", "close": "}" }
2325
]
2426
}

0 commit comments

Comments
 (0)