daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/82704/head^2
Joao Moreno 2019-10-17 14:08:57 +02:00
parent f901a47197 dc50ec98d3
commit c3edc23ccc
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
View File

@ -281,6 +281,14 @@ export class BracketMatchingController extends Disposable implements editorCommo
return;
}
const selections = this._editor.getSelections();
if (selections.length > 100) {
// no bracket matching for high numbers of selections
this._lastBracketsData = [];
this._lastVersionId = 0;
return;
}
const model = this._editor.getModel();
const versionId = model.getVersionId();
let previousData: BracketsData[] = [];
@ -289,8 +297,6 @@ export class BracketMatchingController extends Disposable implements editorCommo
previousData = this._lastBracketsData;
}
const selections = this._editor.getSelections();
let positions: Position[] = [], positionsLen = 0;
for (let i = 0, len = selections.length; i < len; i++) {
let selection = selections[i];
@ -319,6 +325,9 @@ export class BracketMatchingController extends Disposable implements editorCommo
newData[newDataLen++] = previousData[previousIndex];
} else {
let brackets = model.matchBracket(position);
if (!brackets) {
brackets = model.findEnclosingBrackets(position);
}
newData[newDataLen++] = new BracketsData(position, brackets);
}
}

23
src/vs/workbench/browser/parts/editor/editorStatus.ts
View File

@ -363,7 +363,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
return {
id: a.id,
label: a.label,
detail: Language.isDefaultVariant() ? undefined : a.alias,
detail: (Language.isDefaultVariant() || a.label === a.alias) ? undefined : a.alias,
run: () => {
activeTextEditorWidget.focus();
a.run();
@ -1133,14 +1133,19 @@ export class ChangeEncodingAction extends Action {
return this.quickInputService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]);
}
let saveWithEncodingPick: IQuickPickItem;
let reopenWithEncodingPick: IQuickPickItem;
if (Language.isDefaultVariant()) {
saveWithEncodingPick = { label: nls.localize('saveWithEncoding', "Save with Encoding") };
reopenWithEncodingPick = { label: nls.localize('reopenWithEncoding', "Reopen with Encoding") };
} else {
saveWithEncodingPick = { label: nls.localize('saveWithEncoding', "Save with Encoding"), detail: 'Save with Encoding', };
reopenWithEncodingPick = { label: nls.localize('reopenWithEncoding', "Reopen with Encoding"), detail: 'Reopen with Encoding' };
const saveWithEncodingPick: IQuickPickItem = { label: nls.localize('saveWithEncoding', "Save with Encoding") };
const reopenWithEncodingPick: IQuickPickItem = { label: nls.localize('reopenWithEncoding', "Reopen with Encoding") };
if (!Language.isDefaultVariant()) {
const saveWithEncodingAlias = 'Save with Encoding';
if (saveWithEncodingAlias !== saveWithEncodingPick.label) {
saveWithEncodingPick.detail = saveWithEncodingAlias;
}
const reopenWithEncodingAlias = 'Reopen with Encoding';
if (reopenWithEncodingAlias !== reopenWithEncodingPick.label) {
reopenWithEncodingPick.detail = reopenWithEncodingAlias;
}
}
let action: IQuickPickItem;