conflict fixes

Author: eleanorjboyd

src/extension.ts

@@ -22,7 +22,6 @@ import { ExistingProjects } from './features/creators/existingProjects';
 import { ProjectCreatorsImpl } from './features/creators/projectCreators';
 import {
     addPythonProjectCommand,
-    addPythonProject,
     copyPathToClipboard,
     createAnyEnvironmentCommand,
     createEnvironmentCommand,

src/features/envCommands.ts

@@ -1,12 +1,4 @@
 import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode';
-import {
-    EnvironmentManagers,
-    InternalEnvironmentManager,
-    InternalPackageManager,
-    ProjectCreators,
-    PythonProjectManager,
-} from '../internal.api';
-import { traceError, traceInfo, traceVerbose } from '../common/logging';
 import {
     CreateEnvironmentOptions,
     PythonEnvironment,
@@ -15,30 +7,38 @@ import {
     PythonProjectCreator,
     PythonProjectCreatorOptions,
 } from '../api';
-import { setEnvironmentManager, setPackageManager, removePythonProjectSetting } from './settings/settingHelpers';
+import { traceError, traceInfo, traceVerbose } from '../common/logging';
+import {
+    EnvironmentManagers,
+    InternalEnvironmentManager,
+    InternalPackageManager,
+    ProjectCreators,
+    PythonProjectManager,
+} from '../internal.api';
+import { removePythonProjectSetting, setEnvironmentManager, setPackageManager } from './settings/settingHelpers';
 
+import { clipboardWriteText } from '../common/env.apis';
+import {} from '../common/errors/utils';
+import { pickEnvironment } from '../common/pickers/environments';
+import { pickCreator, pickEnvironmentManager, pickPackageManager } from '../common/pickers/managers';
+import { pickProject, pickProjectMany } from '../common/pickers/projects';
+import { activeTextEditor, showErrorMessage } from '../common/window.apis';
+import { quoteArgs } from './execution/execUtils';
 import { runAsTask } from './execution/runAsTask';
+import { runInTerminal } from './terminal/runInTerminal';
+import { TerminalManager } from './terminal/terminalManager';
 import {
     EnvManagerTreeItem,
-    PackageRootTreeItem,
-    PythonEnvTreeItem,
-    ProjectItem,
-    ProjectEnvironment,
-    ProjectPackageRootTreeItem,
-    GlobalProjectItem,
     EnvTreeItemKind,
+    GlobalProjectItem,
+    PackageRootTreeItem,
     PackageTreeItem,
+    ProjectEnvironment,
+    ProjectItem,
     ProjectPackage,
+    ProjectPackageRootTreeItem,
+    PythonEnvTreeItem,
 } from './views/treeViewItems';
-import { pickEnvironment } from '../common/pickers/environments';
-import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers';
-import { pickProject, pickProjectMany } from '../common/pickers/projects';
-import { TerminalManager } from './terminal/terminalManager';
-import { runInTerminal } from './terminal/runInTerminal';
-import { quoteArgs } from './execution/execUtils';
-import {} from '../common/errors/utils';
-import { activeTextEditor, showErrorMessage } from '../common/window.apis';
-import { clipboardWriteText } from '../common/env.apis';
 
 export async function refreshManagerCommand(context: unknown): Promise<void> {
     if (context instanceof EnvManagerTreeItem) {
@@ -368,7 +368,7 @@ export async function addPythonProjectCommand(
         // Use resource as the URI for the project if it is a URI.
         options = {
             name: resource.fsPath,
-            uri: resource,
+            rootUri: resource,
         };
     }