Trim the contents of pipenv dot project file after reading it (#18747)

Kartik Raj · web-flow · commit f3d6c4d64441 · 2022-03-22T17:31:55.000+05:30
* Trim the contents of pipenv dot project file after reading it

* Update tests
diff --git a/src/client/pythonEnvironments/common/environmentManagers/pipenv.ts b/src/client/pythonEnvironments/common/environmentManagers/pipenv.ts
@@ -83,7 +83,7 @@ async function getProjectDir(envFolder: string): Promise<string | undefined> {
     if (!(await pathExists(dotProjectFile))) {
         return undefined;
     }
-    const projectDir = await readFile(dotProjectFile);
+    const projectDir = (await readFile(dotProjectFile)).trim();
     if (!(await pathExists(projectDir))) {
         traceError(
             `The .project file inside environment folder: ${envFolder} doesn't contain a valid path to the project`,
diff --git a/src/test/pythonEnvironments/common/envlayouts/pipenv/globalEnvironments/project2-vnNIWe9P/.project b/src/test/pythonEnvironments/common/envlayouts/pipenv/globalEnvironments/project2-vnNIWe9P/.project
@@ -1 +1 @@
-Absolute path to \src\test\pythonEnvironments\common\envlayouts\pipenv\project2
+Absolute path to \src\test\pythonEnvironments\common\envlayouts\pipenv\project2
diff --git a/src/test/pythonEnvironments/common/envlayouts/virtualhome/.local/share/virtualenvs/project2-vnNIWe9P/.project b/src/test/pythonEnvironments/common/envlayouts/virtualhome/.local/share/virtualenvs/project2-vnNIWe9P/.project
@@ -1 +1 @@
-Absolute path to \src\test\pythonEnvironments\common\envlayouts\pipenv\project2
+Absolute path to \src\test\pythonEnvironments\common\envlayouts\pipenv\project2

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ async function getProjectDir(envFolder: string): Promise<string \| undefined> {`
`83`	`83`	`if (!(await pathExists(dotProjectFile))) {`
`84`	`84`	`return undefined;`
`85`	`85`	`}`
`86`		`- const projectDir = await readFile(dotProjectFile);`
	`86`	`+ const projectDir = (await readFile(dotProjectFile)).trim();`
`87`	`87`	`if (!(await pathExists(projectDir))) {`
`88`	`88`	`traceError(`
`89`	`89`	`The .project file inside environment folder: ${envFolder} doesn't contain a valid path to the project`,
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Absolute path to \src\test\pythonEnvironments\common\envlayouts\pipenv\project2`
	`1`	`+Absolute path to \src\test\pythonEnvironments\common\envlayouts\pipenv\project2`