Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
d4f5a63
tests and hygiene
IanMatthewHuff Jan 18, 2019
8e3bd65
new entry
IanMatthewHuff Jan 18, 2019
b95e06d
remove comment
IanMatthewHuff Jan 18, 2019
94880ff
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 18, 2019
355c903
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 22, 2019
6ffec53
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 23, 2019
1b96132
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 23, 2019
1aa46cf
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 23, 2019
592236d
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 24, 2019
1658515
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 24, 2019
371d894
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 24, 2019
8e8261b
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 25, 2019
ae58f48
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 25, 2019
03fe027
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 28, 2019
a31e148
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 28, 2019
e0db4e0
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 28, 2019
d7ce8c2
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 28, 2019
eae3c3e
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 29, 2019
cf85b37
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 30, 2019
b32593a
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Jan 31, 2019
315fd84
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Jan 31, 2019
d282296
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 5, 2019
9992e9e
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 11, 2019
156299d
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Feb 11, 2019
c87afb6
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 13, 2019
31c839b
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 14, 2019
90c0c86
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Feb 14, 2019
0e794b0
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 22, 2019
1dfe1d6
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 25, 2019
ce25bfb
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Feb 25, 2019
f953e2c
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Feb 28, 2019
18d1ad7
Merge branch 'master' of https://github.com/IanMatthewHuff/vscode-python
IanMatthewHuff Feb 28, 2019
01c3b03
Merge branch 'master' of https://github.com/Microsoft/vscode-python
IanMatthewHuff Mar 4, 2019
018e48b
add telemetry for shift-enter banner
IanMatthewHuff Mar 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/2 Fixes/4636.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Provide telemetry for when we show the shift-enter banner and if the user clicks yes
6 changes: 4 additions & 2 deletions src/client/datascience/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ export enum Telemetry {
ConnectLocalJupyter = 'DATASCIENCE.CONNECTLOCALJUPYTER',
ConnectRemoteJupyter = 'DATASCIENCE.CONNECTREMOTEJUPYTER',
ConnectFailedJupyter = 'DATASCIENCE.CONNECTFAILEDJUPYTER',
RemoteAddCode = 'DATASCIENCE.LIVESHARE.ADDCODE'
}
RemoteAddCode = 'DATASCIENCE.LIVESHARE.ADDCODE',
ShiftEnterBannerShown = 'DATASCIENCE.SHIFTENTER_BANNER_SHOWN',
EnableInteractiveShiftEnter = 'DATASCIENCE.ENABLE_INTERACTIVE_SHIFT_ENTER'
}

export namespace HelpLinks {
export const PythonInteractiveHelpLink = 'https://aka.ms/pyaiinstall';
Expand Down
4 changes: 4 additions & 0 deletions src/client/datascience/shiftEnterBanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import '../common/extensions';
import { IConfigurationService, IPersistentStateFactory,
IPythonExtensionBanner } from '../common/types';
import * as localize from '../common/utils/localize';
import { captureTelemetry, sendTelemetryEvent } from '../telemetry';
import { Telemetry } from './constants';
import { IJupyterExecution } from './types';

export enum InteractiveShiftEnterStateKeys {
Expand Down Expand Up @@ -71,6 +73,7 @@ export class InteractiveShiftEnterBanner implements IPythonExtensionBanner {
return;
}

sendTelemetryEvent(Telemetry.ShiftEnterBannerShown);
const response = await this.appShell.showInformationMessage(this.bannerMessage, ...this.bannerLabels);
switch (response) {
case this.bannerLabels[InteractiveShiftEnterLabelIndex.Yes]: {
Expand Down Expand Up @@ -98,6 +101,7 @@ export class InteractiveShiftEnterBanner implements IPythonExtensionBanner {
await this.persistentState.createGlobalPersistentState<boolean>(InteractiveShiftEnterStateKeys.ShowBanner, false).updateValue(false);
}

@captureTelemetry(Telemetry.EnableInteractiveShiftEnter)
public async enableInteractiveShiftEnter(): Promise<void> {
await this.configuration.updateSetting('dataScience.sendSelectionToInteractiveWindow', true, undefined, ConfigurationTarget.Global);
await this.disable();
Expand Down
2 changes: 2 additions & 0 deletions src/client/telemetry/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ interface IEventNamePropertyMapping {
[Telemetry.ConnectRemoteJupyter]: never | undefined;
[Telemetry.DeleteAllCells]: never | undefined;
[Telemetry.DeleteCell]: never | undefined;
[Telemetry.EnableInteractiveShiftEnter]: never | undefined;
[Telemetry.ExpandAll]: never | undefined;
[Telemetry.ExportNotebook]: never | undefined;
[Telemetry.ExportPythonFile]: never | undefined;
Expand All @@ -325,6 +326,7 @@ interface IEventNamePropertyMapping {
[Telemetry.SelectJupyterURI]: never | undefined;
[Telemetry.SetJupyterURIToLocal]: never | undefined;
[Telemetry.SetJupyterURIToUserSpecified]: never | undefined;
[Telemetry.ShiftEnterBannerShown]: never | undefined;
[Telemetry.ShowHistoryPane]: never | undefined;
[Telemetry.StartJupyter]: never | undefined;
[Telemetry.SubmitCellThroughInput]: never | undefined;
Expand Down