Skip to content

Commit daab11d

Browse files
author
Kartik Raj
authored
Only show terminal notification for basic terminals created using '+' icon (microsoft#22275)
1 parent d758741 commit daab11d

File tree

8 files changed

+18
-11
lines changed

8 files changed

+18
-11
lines changed

src/client/common/utils/localize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export namespace Interpreters {
197197
export const activatingTerminals = l10n.t('Reactivating terminals...');
198198
export const activateTerminalDescription = l10n.t('Activated environment for');
199199
export const terminalEnvVarCollectionPrompt = l10n.t(
200-
'The Python extension automatically activates all terminals using the selected environment, even when the name of the environment{0} is not present in the terminal prompt. [Learn more](https://aka.ms/vscodePythonTerminalActivation).',
200+
'The selected Python environment indicator{0} may not be present in the terminal prompt. Rest assured, all terminals are still activated. [Learn more](https://aka.ms/vscodePythonTerminalActivation).',
201201
);
202202
export const terminalDeactivateProgress = l10n.t('Editing {0}...');
203203
export const restartingTerminal = l10n.t('Restarting terminal and deactivating...');

src/client/terminals/envCollectionActivation/deactivatePrompt.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class TerminalDeactivateLimitationPrompt implements IExtensionSingleActiv
6565
}
6666
if (!isTestExecution()) {
6767
// Avoid showing prompt until startup completes.
68-
await sleep(5000);
68+
await sleep(6000);
6969
}
7070
this.disposableRegistry.push(
7171
this.appShell.onDidWriteTerminalData(async (e) => {

src/client/terminals/envCollectionActivation/indicatorPrompt.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@ export class TerminalIndicatorPrompt implements IExtensionSingleActivationServic
4646
}
4747
if (!isTestExecution()) {
4848
// Avoid showing prompt until startup completes.
49-
await sleep(5000);
49+
await sleep(6000);
5050
}
5151
this.disposableRegistry.push(
5252
this.terminalManager.onDidOpenTerminal(async (terminal) => {
53+
const hideFromUser =
54+
'hideFromUser' in terminal.creationOptions && terminal.creationOptions.hideFromUser;
55+
const strictEnv = 'strictEnv' in terminal.creationOptions && terminal.creationOptions.strictEnv;
56+
if (hideFromUser || strictEnv || terminal.creationOptions.name) {
57+
// Only show this notification for basic terminals created using the '+' button.
58+
return;
59+
}
5360
const cwd =
5461
'cwd' in terminal.creationOptions && terminal.creationOptions.cwd
5562
? terminal.creationOptions.cwd
@@ -78,6 +85,9 @@ export class TerminalIndicatorPrompt implements IExtensionSingleActivationServic
7885
}
7986
const prompts = [Common.doNotShowAgain];
8087
const interpreter = await this.interpreterService.getActiveInterpreter(resource);
88+
if (!interpreter) {
89+
return;
90+
}
8191
const terminalPromptName = getPromptName(interpreter);
8292
const selection = await this.appShell.showInformationMessage(
8393
Interpreters.terminalEnvVarCollectionPrompt.format(terminalPromptName),
@@ -92,10 +102,7 @@ export class TerminalIndicatorPrompt implements IExtensionSingleActivationServic
92102
}
93103
}
94104

95-
function getPromptName(interpreter?: PythonEnvironment) {
96-
if (!interpreter) {
97-
return '';
98-
}
105+
function getPromptName(interpreter: PythonEnvironment) {
99106
if (interpreter.envName) {
100107
return `, ${l10n.t('i.e')} "(${interpreter.envName})"`;
101108
}

src/test/tensorBoard/nbextensionCodeLensProvider.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { TensorboardExperiment } from '../../client/tensorBoard/tensorboarExperi
1111

1212
[true, false].forEach((tbExtensionInstalled) => {
1313
suite(`Tensorboard Extension is ${tbExtensionInstalled ? 'installed' : 'not installed'}`, () => {
14-
suite.only('TensorBoard nbextension code lens provider', () => {
14+
suite('TensorBoard nbextension code lens provider', () => {
1515
let experiment: TensorboardExperiment;
1616
let codeLensProvider: TensorBoardNbextensionCodeLensProvider;
1717
let cancelTokenSource: CancellationTokenSource;

src/test/tensorBoard/tensorBoardImportCodeLensProvider.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { TensorboardExperiment } from '../../client/tensorBoard/tensorboarExperi
1111

1212
[true, false].forEach((tbExtensionInstalled) => {
1313
suite(`Tensorboard Extension is ${tbExtensionInstalled ? 'installed' : 'not installed'}`, () => {
14-
suite.only('TensorBoard import code lens provider', () => {
14+
suite('TensorBoard import code lens provider', () => {
1515
let experiment: TensorboardExperiment;
1616
let codeLensProvider: TensorBoardImportCodeLensProvider;
1717
let cancelTokenSource: CancellationTokenSource;

src/test/tensorBoard/tensorBoardPrompt.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Common } from '../../client/common/utils/localize';
77
import { TensorBoardEntrypointTrigger } from '../../client/tensorBoard/constants';
88
import { TensorBoardPrompt } from '../../client/tensorBoard/tensorBoardPrompt';
99

10-
suite.only('TensorBoard prompt', () => {
10+
suite('TensorBoard prompt', () => {
1111
let applicationShell: ApplicationShell;
1212
let commandManager: CommandManager;
1313
let persistentState: PersistentState<boolean>;

src/test/tensorBoard/tensorBoardUsageTracker.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TensorboardExperiment } from '../../client/tensorBoard/tensorboarExperi
1010

1111
[true, false].forEach((tbExtensionInstalled) => {
1212
suite(`Tensorboard Extension is ${tbExtensionInstalled ? 'installed' : 'not installed'}`, () => {
13-
suite.only('TensorBoard usage tracker', () => {
13+
suite('TensorBoard usage tracker', () => {
1414
let experiment: TensorboardExperiment;
1515
let documentManager: MockDocumentManager;
1616
let tensorBoardImportTracker: TensorBoardUsageTracker;

0 commit comments

Comments
 (0)