Merge branch 'main' into defiant-perch

Author: jswillard

src/vs/base/browser/ui/menu/menu.ts

@@ -1281,7 +1281,6 @@ ${formatRule(Codicon.menuSubmenu)}
 .monaco-menu .monaco-action-bar.vertical .keybinding {
 	font-size: inherit;
 	padding: 0 2em;
-	overflow: hidden;
 	max-height: 100%;
 }
 

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

@@ -587,14 +587,14 @@ async function webviewPreloads(ctx: PreloadContext) {
 		}
 
 		if (node.hasAttribute('recentlyScrolled')) {
-			if (lastTimeScrolled && Date.now() - lastTimeScrolled > 300) {
+			if (lastTimeScrolled && Date.now() - lastTimeScrolled > 400) {
 				// it has been a while since we actually scrolled
-				// if scroll velocity increases, it's likely a new scroll event
-				if (!!previousDelta && deltaY < 0 && deltaY < previousDelta - 2) {
+				// if scroll velocity increases significantly, it's likely a new scroll event
+				if (!!previousDelta && deltaY < 0 && deltaY < previousDelta - 8) {
 					clearTimeout(scrollTimeout);
 					scrolledElement?.removeAttribute('recentlyScrolled');
 					return false;
-				} else if (!!previousDelta && deltaY > 0 && deltaY > previousDelta + 2) {
+				} else if (!!previousDelta && deltaY > 0 && deltaY > previousDelta + 8) {
 					clearTimeout(scrollTimeout);
 					scrolledElement?.removeAttribute('recentlyScrolled');
 					return false;

src/vs/workbench/contrib/testing/browser/testingDecorations.ts

@@ -975,7 +975,13 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 		let testSubmenus: IAction[] = testItems.map(({ currentLabel, testItem }) => {
 			const actions = this.getTestContextMenuActions(testItem.test, testItem.resultItem);
 			disposable.add(actions);
-			return new SubmenuAction(testItem.test.item.extId, stripIcons(currentLabel), actions.object);
+			let label = stripIcons(currentLabel);
+			const lf = label.indexOf('\n');
+			if (lf !== -1) {
+				label = label.slice(0, lf);
+			}
+
+			return new SubmenuAction(testItem.test.item.extId, label, actions.object);
 		});