development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:microsoft/vscode

Browse source
This commit is contained in:
Joao Moreno 2020-01-31 13:51:27 +01:00
parent 9749840fec 5eeab37a1e
commit be0aca7188
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extensions/html-language-features/server/src/test/selectionRanges.test.ts
View file

@ -56,6 +56,7 @@ suite('HTML SelectionRange', () => {
[34, 'none'],
[25, 'display: none'],
[24, ' display: none; '],
[23, '{ display: none; }'],
[19, 'foo { display: none; }'],
[19, 'foo { display: none; } '],
[12, '<style>foo { display: none; } </style>'],

5
src/vs/editor/browser/controller/textAreaHandler.ts
View file

@ -357,8 +357,9 @@ export class TextAreaHandler extends ViewPart {
this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
const accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
if (this._accessibilitySupport === AccessibilitySupport.Enabled && accessibilityPageSize === EditorOptions.accessibilityPageSize.defaultValue) {
// If a screen reader is attached and the default value is not set we shuold automatically increase the page size to 1000 for a better experience
this._accessibilityPageSize = 1000;
// If a screen reader is attached and the default value is not set we shuold automatically increase the page size to 160 for a better experience
// If we put more than 160 lines the nvda can not handle this https://github.com/microsoft/vscode/issues/89717
this._accessibilityPageSize = 160;
} else {
this._accessibilityPageSize = accessibilityPageSize;
}

2
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
View file

@ -334,7 +334,7 @@ class Widget {
if (MIN_LIMIT < 0) {
// And we need to make sure we haven't expanded them before the page
const delta3 = MIN_LIMIT;
const delta3 = -MIN_LIMIT;
MIN_LIMIT += delta3;
MAX_LIMIT += delta3;
}

2
src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
View file

@ -396,7 +396,7 @@ registerAction2(class extends Action2 {
constructor() {
super({
id: 'workbench.extensions.action.configure',
title: { value: localize('workbench.extensions.action.configure', "Configure..."), original: 'Configure...' },
title: { value: localize('workbench.extensions.action.configure', "Extension Settings"), original: 'Extension Settings' },
menu: {
id: MenuId.ExtensionContext,
group: '2_configure',

10
src/vs/workbench/services/bulkEdit/browser/conflicts.ts
View file

@ -113,11 +113,11 @@ export class ConflictDetector {
list(): URI[] {
const result: URI[] = this._conflicts.keys();
this._changes.forEach((_value, key) => {
if (!this._conflicts.has(key)) {
result.push(key);
}
});
// this._changes.forEach((_value, key) => {
// if (!this._conflicts.has(key)) {
// result.push(key);
// }
// });
return result;
}
}