Skip to content

Commit e7c2fdd

Browse files
DonJayamanneDonJayamanne
authored
Misc changes (#9)
* added feeback and survey * moved telemetry files into its own folder * track whether user responded to feedback * introduce constants * fix formatting of type * track whether user responded to feedback prompt * check whether to display banner * update labels and url * changes names * updated link to survey * fix storage key * change names of debug configs * renamed extensionid
1 parent 8c038f9 commit e7c2fdd

14 files changed

Lines changed: 52 additions & 55 deletions

File tree

‎package.json‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
"displayName": "Python",
44
"description": "Linting, Debugging (multi-threaded, remote), Intellisense, code formatting, refactoring, unit tests, snippets, Data Science (with Jupyter), PySpark and more.",
55
"version": "0.7.0",
6-
"publisher": "donjayamanne",
6+
"publisher": "ms-python",
77
"author": {
8-
"name": "Don Jayamanne",
9-
"email": "don.jayamanne@yahoo.com"
8+
"name": "Microsoft Corporation"
109
},
1110
"license": "MIT",
12-
"homepage": "http://donjayamanne.github.io/pythonVSCode/",
11+
"homepage": "https://github.com/Microsoft/vscode-python",
1312
"repository": {
1413
"type": "git",
15-
"url": "https://github.com/DonJayamanne/pythonVSCode"
14+
"url": "https://github.com/Microsoft/vscode-python"
1615
},
1716
"bugs": {
18-
"url": "https://github.com/DonJayamanne/pythonVSCode/issues"
17+
"url": "https://github.com/Microsoft/vscode-python/issues"
1918
},
2019
"icon": "icon.png",
2120
"galleryBanner": {
@@ -279,7 +278,7 @@
279278
"html"
280279
]
281280
},
282-
"aiKey": "fce7a3d5-4665-4404-b786-31a6306749a6",
281+
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
283282
"program": "./out/client/debugger/Main.js",
284283
"runtime": "node",
285284
"configurationSnippets": [
@@ -723,7 +722,7 @@
723722
]
724723
},
725724
{
726-
"name": "PySpark",
725+
"name": "Python: PySpark",
727726
"type": "python",
728727
"request": "launch",
729728
"stopOnEntry": true,
@@ -747,7 +746,7 @@
747746
]
748747
},
749748
{
750-
"name": "Python Module",
749+
"name": "Python: Module",
751750
"type": "python",
752751
"request": "launch",
753752
"stopOnEntry": true,
@@ -763,7 +762,7 @@
763762
]
764763
},
765764
{
766-
"name": "Integrated Terminal/Console",
765+
"name": "Python: Terminal (integrated)",
767766
"type": "python",
768767
"request": "launch",
769768
"stopOnEntry": true,
@@ -779,7 +778,7 @@
779778
]
780779
},
781780
{
782-
"name": "External Terminal/Console",
781+
"name": "Python: Terminal (external)",
783782
"type": "python",
784783
"request": "launch",
785784
"stopOnEntry": true,
@@ -795,7 +794,7 @@
795794
]
796795
},
797796
{
798-
"name": "Django",
797+
"name": "Python: Django",
799798
"type": "python",
800799
"request": "launch",
801800
"stopOnEntry": true,
@@ -817,7 +816,7 @@
817816
]
818817
},
819818
{
820-
"name": "Flask",
819+
"name": "Python: Flask (0.11.x or later)",
821820
"type": "python",
822821
"request": "launch",
823822
"stopOnEntry": false,
@@ -840,7 +839,7 @@
840839
]
841840
},
842841
{
843-
"name": "Flask (old)",
842+
"name": "Python: Flask (0.10.x or earlier)",
844843
"type": "python",
845844
"request": "launch",
846845
"stopOnEntry": false,
@@ -857,7 +856,7 @@
857856
]
858857
},
859858
{
860-
"name": "Pyramid",
859+
"name": "Python: Pyramid",
861860
"type": "python",
862861
"request": "launch",
863862
"stopOnEntry": true,
@@ -876,7 +875,7 @@
876875
]
877876
},
878877
{
879-
"name": "Watson",
878+
"name": "Python: Watson",
880879
"type": "python",
881880
"request": "launch",
882881
"stopOnEntry": true,
@@ -897,7 +896,7 @@
897896
]
898897
},
899898
{
900-
"name": "Attach (Remote Debug)",
899+
"name": "Python: Attach",
901900
"type": "python",
902901
"request": "attach",
903902
"localRoot": "${workspaceRoot}",

‎package.nls.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
22
"python.snippet.launch.standard.label": "Python",
33
"python.snippet.launch.standard.description": "Debug a Python program with standard output",
4-
"python.snippet.launch.pyspark.label": "PySpark",
4+
"python.snippet.launch.pyspark.label": "Python: PySpark",
55
"python.snippet.launch.pyspark.description": "Debug PySpark",
6-
"python.snippet.launch.module.label": "Python Module",
6+
"python.snippet.launch.module.label": "Python: Module",
77
"python.snippet.launch.module.description": "Debug a Python Module",
8-
"python.snippet.launch.terminal.label": "Python Program with Terminal",
8+
"python.snippet.launch.terminal.label": "Python: Terminal (integrated)",
99
"python.snippet.launch.terminal.description": "Debug a Python program with Integrated Terminal/Console",
10-
"python.snippet.launch.externalTerminal.label": "Python Program with External Terminal",
10+
"python.snippet.launch.externalTerminal.label": "Python: Terminal (external)",
1111
"python.snippet.launch.externalTerminal.description": "Debug a Python program with External Terminal/Console",
12-
"python.snippet.launch.django.label": "Django Application",
12+
"python.snippet.launch.django.label": "Python: Django",
1313
"python.snippet.launch.django.description": "Debug a Django Application",
14-
"python.snippet.launch.flask.label": "Flask Application",
14+
"python.snippet.launch.flask.label": "Python: Flask (0.11.x or later)",
1515
"python.snippet.launch.flask.description": "Debug a Flask Application",
16-
"python.snippet.launch.flaskOld.label": "Flask (old) Application",
16+
"python.snippet.launch.flaskOld.label": "Python: Flask (0.10.x or earlier)",
1717
"python.snippet.launch.flaskOld.description": "Debug an older styled Flask Application",
18-
"python.snippet.launch.pyramid.label": "Pyramid Application",
18+
"python.snippet.launch.pyramid.label": "Python: Pyramid Application",
1919
"python.snippet.launch.pyramid.description": "Debug a Pyramid Application",
20-
"python.snippet.launch.watson.label": "Watson Application",
20+
"python.snippet.launch.watson.label": "Python: Watson Application",
2121
"python.snippet.launch.watson.description": "Debug a Watson Application",
22-
"python.snippet.launch.attach.label": "Attach Python Debugger",
22+
"python.snippet.launch.attach.label": "Python: Attach",
2323
"python.snippet.launch.attach.description": "Attach the debugger for remote debugging",
24-
"python.snippet.launch.scrapy.label": "Debug Scrapy",
24+
"python.snippet.launch.scrapy.label": "Python: Scrapy",
2525
"python.snippet.launch.scrapy.description": "Scrapy with Integrated Terminal/Console"
2626
}

‎pythonFiles/PythonTools/ipythonServer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
except ImportError:
5555
from queue import Empty, Queue # Python 3
5656

57-
DEBUG = os.environ.get('DEBUG_DJAYAMANNE_IPYTHON', '0') == '1'
57+
DEBUG = os.environ.get('DEBUG_EXTENSION_IPYTHON', '0') == '1'
5858
TEST = os.environ.get('VSC_PYTHON_CI_TEST', '0') == '1'
5959

6060
# The great "support IPython 2, 3, 4" strat begins

‎pythonFiles/completionServer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
except ImportError:
5555
from queue import Empty, Queue # Python 3
5656

57-
DEBUG = os.environ.get('DEBUG_DJAYAMANNE_IPYTHON', '0') == '1'
57+
DEBUG = os.environ.get('DEBUG_EXTENSION_IPYTHON', '0') == '1'
5858
TEST = os.environ.get('VSC_PYTHON_CI_TEST', '0') == '1'
5959

6060
def _debug_write(out):

‎src/client/banner.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import * as os from 'os';
88
import { window } from 'vscode';
99
import { IPersistentStateFactory, PersistentState } from './common/persistentState';
1010

11-
const BANNER_URL = 'https://aka.ms/egv4z1';
11+
const BANNER_URL = 'https://aka.ms/pvsc-at-msft';
1212

1313
export class BannerService {
1414
private shouldShowBanner: PersistentState<boolean>;
1515
constructor(persistentStateFactory: IPersistentStateFactory) {
16-
this.shouldShowBanner = persistentStateFactory.createGlobalPersistentState('SHOW_NEW_EXT_BANNER', true);
16+
this.shouldShowBanner = persistentStateFactory.createGlobalPersistentState('SHOW_NEW_PUBLISHER_BANNER', true);
1717
this.showBanner();
1818
}
1919
private showBanner() {
@@ -22,8 +22,8 @@ export class BannerService {
2222
}
2323
this.shouldShowBanner.value = false;
2424

25-
const message = 'Would you like to know what is new?';
26-
const yesButton = 'Yes';
25+
const message = 'The Python extension is now published by Microsoft!';
26+
const yesButton = 'Read more';
2727
window.showInformationMessage(message, yesButton).then((value) => {
2828
if (value === yesButton) {
2929
this.displayBanner();

‎src/client/feedback/feedbackService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { FEEDBACK } from '../telemetry/constants';
1313
import { captureTelemetry, sendTelemetryEvent } from '../telemetry/index';
1414
import { FeedbackCounters } from './counters';
1515

16-
const FEEDBACK_URL = 'https://aka.ms/egv4z1';
16+
const FEEDBACK_URL = 'https://www.surveymonkey.com/r/293C9HY';
1717

1818
export class FeedbackService implements Disposable {
1919
private counters?: FeedbackCounters;
@@ -81,7 +81,7 @@ export class FeedbackService implements Disposable {
8181
private showPrompt() {
8282
this.promptDisplayed = true;
8383

84-
const message = 'Would you tell us how likely you are to recommend the Python extension for VS Code to a friend or colleague?';
84+
const message = 'Would you tell us how likely you are to recommend the Microsoft Python extension for VS Code to a friend or colleague?';
8585
const yesButton = 'Yes';
8686
const dontShowAgainButton = 'Don\'t Show Again';
8787
window.showInformationMessage(message, yesButton, dontShowAgainButton).then((value) => {

‎src/client/formatters/baseFormatter.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
'use strict';
22

3-
import * as vscode from 'vscode';
43
import * as fs from 'fs';
54
import * as path from 'path';
6-
import * as settings from './../common/configSettings';
5+
import * as vscode from 'vscode';
76
import { Uri } from 'vscode';
8-
import { execPythonFile } from './../common/utils';
9-
import { getTextEditsFromPatch, getTempFileWithDocumentContents } from './../common/editor';
107
import { isNotInstalledError } from '../common/helpers';
118
import { Installer, Product } from '../common/installer';
9+
import * as settings from './../common/configSettings';
10+
import { getTempFileWithDocumentContents, getTextEditsFromPatch } from './../common/editor';
11+
import { execPythonFile } from './../common/utils';
1212

1313

1414
export abstract class BaseFormatter {
@@ -79,10 +79,8 @@ export abstract class BaseFormatter {
7979
// Ok if we have a space after the file name, this means we have some arguments defined and this isn't supported
8080
if (stuffAfterFileName.trim().indexOf(' ') > 0) {
8181
customError = `Formatting failed, custom arguments in the 'python.formatting.${this.Id}Path' is not supported.\n` +
82-
`Custom arguments to the formatter can be defined in 'python.formatter.${this.Id}Args' setting of settings.json.\n` +
83-
'For further details, please see https://github.com/DonJayamanne/pythonVSCode/wiki/Troubleshooting-Linting#2-linting-with-xxx-failed-';
84-
}
85-
else {
82+
`Custom arguments to the formatter can be defined in 'python.formatter.${this.Id}Args' setting of settings.json.`;
83+
} else {
8684
customError += `\nYou could either install the '${this.Id}' formatter, turn it off or use another formatter.`;
8785
this.installer.promptToInstall(this.product, resource);
8886
}

‎src/client/jupyter/jupyter_client/jupyterSocketClient.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class JupyterSocketClient extends SocketCallbackHandler {
1616
private isDebugging: boolean;
1717
constructor(socketServer: SocketServer, private outputChannel: OutputChannel) {
1818
super(socketServer);
19-
this.isDebugging = process.env['DEBUG_DJAYAMANNE_IPYTHON'] === '1';
19+
this.isDebugging = process.env['DEBUG_EXTENSION_IPYTHON'] === '1';
2020
this.registerCommandHandler(ResponseCommands.Pong, this.onPong.bind(this));
2121
this.registerCommandHandler(ResponseCommands.ListKernelsSpecs, this.onKernelsListed.bind(this));
2222
this.registerCommandHandler(ResponseCommands.Error, this.onError.bind(this));

‎src/client/jupyter/jupyter_client/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class JupyterClientAdapter extends EventEmitter implements IJupyterClient
5757
this.startDef = createDeferred<any>();
5858
const pyFile = path.join(__dirname, '..', '..', '..', '..', 'pythonFiles', 'PythonTools', 'ipythonServer.py');
5959
const newEnv = {};
60-
// const newEnv = {'DEBUG_DJAYAMANNE_IPYTHON':'1'};
60+
// const newEnv = {'DEBUG_EXTENSION_IPYTHON':'1'};
6161
Object.assign(newEnv, envVariables);
6262
Object.assign(newEnv, process.env);
6363

‎src/client/jupyter/jupyter_client/resultParser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class MessageParser extends EventEmitter {
1212
private isDebugging: boolean;
1313
constructor(private outputChannel: OutputChannel) {
1414
super();
15-
this.isDebugging = process.env['DEBUG_DJAYAMANNE_IPYTHON'] === '1';
15+
this.isDebugging = process.env['DEBUG_EXTENSION_IPYTHON'] === '1';
1616
}
1717
private writeToDebugLog(message: string) {
1818
if (!this.isDebugging) {

0 commit comments

Comments
 (0)