Merge branch 'main' into fix-238886

microsoft · Jan 27, 2025 · 232163a · 232163a
2 parents d09ab61 + 0a964fb
commit 232163a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 55 deletions.
diff --git a/extensions/terminal-suggest/.vscodeignore b/extensions/terminal-suggest/.vscodeignore
@@ -2,6 +2,4 @@ src/**
 out/**
 tsconfig.json
 .vscode/**
-extension.webpack.config.js
-extension-browser.webpack.config.js
 package-lock.json
diff --git a/extensions/terminal-suggest/extension-browser.webpack.config.js b/extensions/terminal-suggest/extension-browser.webpack.config.js
diff --git a/extensions/terminal-suggest/extension.webpack.config.js b/extensions/terminal-suggest/extension.webpack.config.js
diff --git a/extensions/terminal-suggest/package.json b/extensions/terminal-suggest/package.json
@@ -22,13 +22,15 @@
     "compile": "npx gulp compile-extension:terminal-suggest",
     "watch": "npx gulp watch-extension:terminal-suggest"
   },
-
   "main": "./out/terminalSuggestMain",
   "activationEvents": [
     "onTerminalCompletionsRequested"
   ],
   "repository": {
     "type": "git",
     "url": "https://github.com/microsoft/vscode.git"
-  }
+  },
+  "extensionKind": [
+    "workspace"
+  ]
 }
diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts
@@ -176,5 +176,5 @@ export function compareTwoNullableNumbers(a: number | undefined, b: number | und
 	}
 }
 
-export const PREVIEW_INDICATOR_DESCRIPTION = localize('previewIndicatorDescription', "This setting controls a new feature that is still under refinement yet ready to use. Feedback is welcome.");
-export const EXPERIMENTAL_INDICATOR_DESCRIPTION = localize('experimentalIndicatorDescription', "This setting controls a new feature that is actively being developed and may be unstable. It is subject to change or removal.");
+export const PREVIEW_INDICATOR_DESCRIPTION = localize('previewIndicatorDescription', "Preview setting: this setting controls a new feature that is still under refinement yet ready to use. Feedback is welcome.");
+export const EXPERIMENTAL_INDICATOR_DESCRIPTION = localize('experimentalIndicatorDescription', "Experimental setting: this setting controls a new feature that is actively being developed and may be unstable. It is subject to change or removal.");
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -709,10 +709,16 @@ class TestResultsPeek extends PeekViewWidget {
 			return defaultMaxHeight;
 		}
 
+		if (this.testingPeek.historyVisible.value) { // don't cap height with the history split
+			return defaultMaxHeight;
+		}
+
 		const lineHeight = this.editor.getOption(EditorOption.lineHeight);
 		// 41 is experimentally determined to be the overhead of the peek view itself
 		// to avoid showing scrollbars by default in its content.
-		return Math.min(defaultMaxHeight || Infinity, (contentHeight + 41) / lineHeight);
+		const basePeekOverhead = 41;
+
+		return Math.min(defaultMaxHeight || Infinity, (contentHeight + basePeekOverhead) / lineHeight + 1);
 	}
 
 	private applyTheme() {