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

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, '<style>foo { display: none; } </style>'],

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;
 		}

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;
 			}

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', "Extension Settings"), original: 'Extension Settings' },
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: '2_configure',

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;
 	}
 }