Merge pull request #10 from eleanorjboyd/fix_main_3

Fix main 3

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
       - 'release-*'
 
 env:
-  NODE_VERSION: 14.18.2
+  NODE_VERSION: 16.17.1
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   # Force a path with spaces and to test extension works in these scenarios
   # Unicode characters are causing 2.7 failures so skip that for now.

.github/workflows/pr-check.yml

@@ -8,7 +8,7 @@ on:
       - release*
 
 env:
-  NODE_VERSION: 14.18.2
+  NODE_VERSION: 16.17.1
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
   ARTIFACT_NAME_VSIX: ms-python-insiders-vsix

.nvmrc

@@ -1 +1 @@
-v14.18.2
+v16.17.1

build/azure-pipeline.pre-release.yml

@@ -25,7 +25,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '14.18.2'
+          versionSpec: '16.17.1'
         displayName: Select Node version
 
       - task: UsePythonVersion@0

build/azure-pipeline.stable.yml

@@ -28,7 +28,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '14.18.2'
+          versionSpec: '16.17.1'
         displayName: Select Node version
 
       - task: UsePythonVersion@0

package.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), Jupyter Notebooks, code formatting, refactoring, unit tests, and more.",
-    "version": "2023.7.0-dev",
+    "version": "2023.9.0-dev",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },
@@ -23,7 +23,8 @@
         "envShellEvent",
         "testObserver",
         "quickPickItemTooltip",
-        "envCollectionWorkspace"
+        "envCollectionWorkspace",
+        "saveEditor"
     ],
     "author": {
         "name": "Microsoft Corporation"
@@ -44,7 +45,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.78.0-20230421"
+        "vscode": "^1.78.0"
     },
     "keywords": [
         "python",
@@ -277,6 +278,11 @@
                 "command": "python.createEnvironment",
                 "title": "%python.command.python.createEnvironment.title%"
             },
+            {
+                "category": "Python",
+                "command": "python.createEnvironment-button",
+                "title": "%python.command.python.createEnvironment.title%"
+            },
             {
                 "category": "Python",
                 "command": "python.enableLinting",
@@ -1700,12 +1706,12 @@
             "editor/content": [
                 {
                     "group": "Python",
-                    "command": "python.createEnvironment",
+                    "command": "python.createEnvironment-button",
                     "when": "resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported && !inDiffEditor"
                 },
                 {
                     "group": "Python",
-                    "command": "python.createEnvironment",
+                    "command": "python.createEnvironment-button",
                     "when": "resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported  && !inDiffEditor"
                 }
             ],
@@ -1915,7 +1921,7 @@
         "@types/md5": "^2.1.32",
         "@types/mocha": "^9.1.0",
         "@types/nock": "^10.0.3",
-        "@types/node": "^14.18.0",
+        "@types/node": "^16.17.0",
         "@types/semver": "^5.5.0",
         "@types/shortid": "^0.0.29",
         "@types/sinon": "^10.0.11",

src/client/common/application/types.ts

@@ -851,6 +851,16 @@ export interface IWorkspaceService {
      * @return A promise that resolves to a {@link TextDocument document}.
      */
     openTextDocument(options?: { language?: string; content?: string }): Thenable<TextDocument>;
+    /**
+     * Saves the editor identified by the given resource to a new file name as provided by the user and
+     * returns the resulting resource or `undefined` if save was not successful or cancelled.
+     *
+     * **Note** that an editor with the provided resource must be opened in order to be saved as.
+     *
+     * @param uri the associated uri for the opened editor to save as.
+     * @return A thenable that resolves when the save-as operation has finished.
+     */
+    saveAs(uri: Uri): Thenable<Uri | undefined>;
 }
 
 export const ITerminalManager = Symbol('ITerminalManager');

src/client/common/application/workspace.ts

@@ -112,4 +112,14 @@ export class WorkspaceService implements IWorkspaceService {
         const enabledSearchExcludes = Object.keys(searchExcludes).filter((key) => searchExcludes.get(key) === true);
         return `{${enabledSearchExcludes.join(',')}}`;
     }
+
+    public async saveAs(uri: Uri): Promise<Uri | undefined> {
+        try {
+            // This is a proposed API hence putting it inside try...catch.
+            const result = await workspace.saveAs(uri);
+            return result;
+        } catch (ex) {
+            return undefined;
+        }
+    }
 }

src/client/common/constants.ts

@@ -37,6 +37,7 @@ export namespace Commands {
     export const CreateNewFile = 'python.createNewFile';
     export const ClearWorkspaceInterpreter = 'python.clearWorkspaceInterpreter';
     export const Create_Environment = 'python.createEnvironment';
+    export const Create_Environment_Button = 'python.createEnvironment-button';
     export const Create_Terminal = 'python.createTerminal';
     export const Debug_In_Terminal = 'python.debugInTerminal';
     export const Enable_Linter = 'python.enableLinting';

src/client/common/process/logger.ts

@@ -28,7 +28,8 @@ export class ProcessLogger implements IProcessLogger {
             : fileOrCommand;
         const info = [`> ${this.getDisplayCommands(command)}`];
         if (options?.cwd) {
-            info.push(`cwd: ${this.getDisplayCommands(options.cwd)}`);
+            const cwd: string = typeof options?.cwd === 'string' ? options?.cwd : options?.cwd?.toString();
+            info.push(`cwd: ${this.getDisplayCommands(cwd)}`);
         }
         if (typeof options?.shell === 'string') {
             info.push(`shell: ${identifyShellFromShellPath(options?.shell)}`);

src/client/common/process/rawProcessApis.ts

@@ -192,7 +192,7 @@ export function execObservable(
     let procExited = false;
     const disposable: IDisposable = {
         dispose() {
-            if (proc && !proc.killed && !procExited) {
+            if (proc && proc.pid && !proc.killed && !procExited) {
                 killPid(proc.pid);
             }
             if (proc) {

src/client/common/utils/localize.ts

@@ -351,7 +351,7 @@ export namespace DebugConfigStrings {
         export const enterManagePyPath = {
             title: l10n.t('Debug Django'),
             prompt: l10n.t(
-                "Enter the path to manage.py ('${workspaceFolderToken}' points to the root of the current workspace folder)",
+                "Enter the path to manage.py ('${workspaceFolder}' points to the root of the current workspace folder)",
             ),
             invalid: l10n.t('Enter a valid Python file path'),
         };
@@ -407,9 +407,13 @@ export namespace Testing {
     export const testNotConfigured = l10n.t('No test framework configured.');
     export const cancelUnittestDiscovery = l10n.t('Canceled unittest test discovery');
     export const errorUnittestDiscovery = l10n.t('Unittest test discovery error');
+    export const cancelPytestDiscovery = l10n.t('Canceled pytest test discovery');
+    export const errorPytestDiscovery = l10n.t('pytest test discovery error');
     export const seePythonOutput = l10n.t('(see Output > Python)');
     export const cancelUnittestExecution = l10n.t('Canceled unittest test execution');
     export const errorUnittestExecution = l10n.t('Unittest test execution error');
+    export const cancelPytestExecution = l10n.t('Canceled pytest test execution');
+    export const errorPytestExecution = l10n.t('Pytest test execution error');
 }
 
 export namespace OutdatedDebugger {

src/client/common/utils/multiStepInput.ts

@@ -76,7 +76,7 @@ interface InputBoxParameters {
     validate(value: string): Promise<string | undefined>;
 }
 
-type MultiStepInputQuickPicResponseType<T, P> = T | (P extends { buttons: (infer I)[] } ? I : never) | undefined;
+type MultiStepInputQuickPickResponseType<T, P> = T | (P extends { buttons: (infer I)[] } ? I : never) | undefined;
 type MultiStepInputInputBoxResponseType<P> = string | (P extends { buttons: (infer I)[] } ? I : never) | undefined;
 export interface IMultiStepInput<S> {
     run(start: InputStep<S>, state: S): Promise<void>;
@@ -88,7 +88,7 @@ export interface IMultiStepInput<S> {
         activeItem,
         placeholder,
         customButtonSetups,
-    }: P): Promise<MultiStepInputQuickPicResponseType<T, P>>;
+    }: P): Promise<MultiStepInputQuickPickResponseType<T, P>>;
     showInputBox<P extends InputBoxParameters>({
         title,
         step,
@@ -126,7 +126,7 @@ export class MultiStepInput<S> implements IMultiStepInput<S> {
         keepScrollPosition,
         sortByLabel,
         initialize,
-    }: P): Promise<MultiStepInputQuickPicResponseType<T, P>> {
+    }: P): Promise<MultiStepInputQuickPickResponseType<T, P>> {
         const disposables: Disposable[] = [];
         const input = this.shell.createQuickPick<T>();
         input.title = title;