From 8d4cdbaa8d64514a5eb3b186b9a31b66cd8a9753 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 31 Jan 2020 09:09:02 +0100 Subject: [PATCH 1/6] [html] fix semantic selection test --- .../server/src/test/selectionRanges.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/html-language-features/server/src/test/selectionRanges.test.ts b/extensions/html-language-features/server/src/test/selectionRanges.test.ts index 98bd73bc9bc0d..dbc33d93a9bab 100644 --- a/extensions/html-language-features/server/src/test/selectionRanges.test.ts +++ b/extensions/html-language-features/server/src/test/selectionRanges.test.ts @@ -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, ''], From af69a4f2b1d7d796af904af31328ec8e85b66bd9 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 31 Jan 2020 11:01:40 +0100 Subject: [PATCH 2/6] fixes #89717 --- src/vs/editor/browser/controller/textAreaHandler.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts index ea4e4f8930bc2..7a22ab779d3d9 100644 --- a/src/vs/editor/browser/controller/textAreaHandler.ts +++ b/src/vs/editor/browser/controller/textAreaHandler.ts @@ -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; } From 76bbe9f025b839ee30fd1de1b6481618dbb2003e Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 31 Jan 2020 11:19:53 +0100 Subject: [PATCH 3/6] Fix #89769 --- .../contrib/extensions/browser/extensions.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts index 2ec7478dfa0ed..28819a39d599d 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts @@ -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', "Configure Extension Settings"), original: 'Configure Extension Settings' }, menu: { id: MenuId.ExtensionContext, group: '2_configure', From ba633b26835af4cbabd0926084c81307e3e6a534 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 31 Jan 2020 11:32:06 +0100 Subject: [PATCH 4/6] #89769 Remove word configure --- .../contrib/extensions/browser/extensions.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts index 28819a39d599d..3228cb72d0c71 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts @@ -396,7 +396,7 @@ registerAction2(class extends Action2 { constructor() { super({ id: 'workbench.extensions.action.configure', - title: { value: localize('workbench.extensions.action.configure', "Configure Extension Settings"), original: 'Configure Extension Settings' }, + title: { value: localize('workbench.extensions.action.configure', "Extension Settings"), original: 'Extension Settings' }, menu: { id: MenuId.ExtensionContext, group: '2_configure', From 92da5890d8c30dd9b4410e7d0f2f8ef819e8ec97 Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Fri, 31 Jan 2020 12:29:54 +0100 Subject: [PATCH 5/6] Fixes #89675: Fix arithmetic --- .../editor/browser/viewParts/contentWidgets/contentWidgets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts index f4eea64640ffe..92f0ba71d28ae 100644 --- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts +++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts @@ -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; } From 5eeab37a1ebfab3e11b04f6d033a72202bbeb162 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 31 Jan 2020 12:44:19 +0100 Subject: [PATCH 6/6] only check for conflicts, not changes. #89776 --- .../workbench/services/bulkEdit/browser/conflicts.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/services/bulkEdit/browser/conflicts.ts b/src/vs/workbench/services/bulkEdit/browser/conflicts.ts index 7f0541c4817e9..cd1996d2ab7ad 100644 --- a/src/vs/workbench/services/bulkEdit/browser/conflicts.ts +++ b/src/vs/workbench/services/bulkEdit/browser/conflicts.ts @@ -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; } }