From a6a2d96e4331539c17260e5eaca80b7804faa63c Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Mon, 27 Jan 2025 11:17:08 -0800 Subject: [PATCH 1/3] testing: allow expanding test output diff when inline history is visible (#238883) Fixes #237850 --- .../contrib/testing/browser/testingOutputPeek.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts index 808e68a6ca9a4..21417a0ea2e05 100644 --- 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() { From b54c554bb2ea20e567c6347097f8e9fdbac166ca Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Mon, 27 Jan 2025 13:21:15 -0600 Subject: [PATCH 2/3] rm webpack config from terminal-suggest (#238874) --- extensions/terminal-suggest/.vscodeignore | 2 -- .../extension-browser.webpack.config.js | 25 ------------------- .../extension.webpack.config.js | 23 ----------------- extensions/terminal-suggest/package.json | 6 +++-- 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 extensions/terminal-suggest/extension-browser.webpack.config.js delete mode 100644 extensions/terminal-suggest/extension.webpack.config.js diff --git a/extensions/terminal-suggest/.vscodeignore b/extensions/terminal-suggest/.vscodeignore index f05a79416be02..7251a128a0386 100644 --- 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 deleted file mode 100644 index 4b7c7460ff08a..0000000000000 --- a/extensions/terminal-suggest/extension-browser.webpack.config.js +++ /dev/null @@ -1,25 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -//@ts-check - -'use strict'; - -const withBrowserDefaults = require('../shared.webpack.config').browser; - -module.exports = withBrowserDefaults({ - context: __dirname, - entry: { - extension: './src/terminalSuggestMain.ts' - }, - output: { - filename: 'terminalSuggestMain.js' - }, - resolve: { - fallback: { - 'child_process': false - } - } -}); diff --git a/extensions/terminal-suggest/extension.webpack.config.js b/extensions/terminal-suggest/extension.webpack.config.js deleted file mode 100644 index 89f3ea28d8747..0000000000000 --- a/extensions/terminal-suggest/extension.webpack.config.js +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -//@ts-check -'use strict'; - -const withDefaults = require('../shared.webpack.config'); - -module.exports = withDefaults({ - context: __dirname, - entry: { - extension: './src/terminalSuggestMain.ts' - }, - output: { - filename: 'terminalSuggestMain.js' - }, - resolve: { - mainFields: ['module', 'main'], - extensions: ['.ts', '.js'] // support ts-files and js-files - } -}); diff --git a/extensions/terminal-suggest/package.json b/extensions/terminal-suggest/package.json index 82e488dd9f527..bcf53c171c50d 100644 --- a/extensions/terminal-suggest/package.json +++ b/extensions/terminal-suggest/package.json @@ -22,7 +22,6 @@ "compile": "npx gulp compile-extension:terminal-suggest", "watch": "npx gulp watch-extension:terminal-suggest" }, - "main": "./out/terminalSuggestMain", "activationEvents": [ "onTerminalCompletionsRequested" @@ -30,5 +29,8 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" - } + }, + "extensionKind": [ + "workspace" + ] } From 0a964fb4f89d1cd99f59d296fc7762f0c1ad4f12 Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:38:57 -0800 Subject: [PATCH 3/3] Clarify setting types (#238885) --- src/vs/workbench/contrib/preferences/common/preferences.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts index b681d7d6787d9..10244f4354b32 100644 --- 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.");