Fix getting of project root on Command Palette commands execution (#1160

)
microsoft · Nov 8, 2019 · 911cacb · 911cacb
1 parent a084c9c
commit 911cacb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/common/packager.ts b/src/common/packager.ts
@@ -71,6 +71,10 @@ export class Packager {
         return this.packagerStatus;
     }
 
+    public getProjectPath(): string {
+        return this.projectPath;
+    }
+
     public getPackagerArgs(rnVersion: string, resetCache: boolean = false): Q.Promise<string[]> {
         let args: string[] = ["--port", this.port.toString()];
 

diff --git a/src/extension/commandPaletteHandler.ts b/src/extension/commandPaletteHandler.ts
@@ -65,7 +65,7 @@ export class CommandPaletteHandler {
     public static startPackager(): Q.Promise<void> {
         return this.selectProject()
             .then((project: IReactNativeProject) => {
-                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.workspaceFolder.uri.fsPath)
+                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.packager.getProjectPath())
                     .then(version => {
                         return this.executeCommandInContext("startPackager", project.workspaceFolder, () => {
                             return project.packager.isRunning()
@@ -105,7 +105,7 @@ export class CommandPaletteHandler {
     public static restartPackager(): Q.Promise<void> {
         return this.selectProject()
             .then((project: IReactNativeProject) => {
-                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.workspaceFolder.uri.fsPath)
+                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.packager.getProjectPath())
                     .then(version => {
                         return this.executeCommandInContext("restartPackager", project.workspaceFolder, () =>
                             this.runRestartPackagerCommandAndUpdateStatus(project));
@@ -136,7 +136,7 @@ export class CommandPaletteHandler {
         return this.selectProject()
             .then((project: IReactNativeProject) => {
                 TargetPlatformHelper.checkTargetPlatformSupport("android");
-                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.workspaceFolder.uri.fsPath)
+                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.packager.getProjectPath())
                     .then(version => {
                         project.reactNativeVersion = version;
                         return this.executeCommandInContext("runAndroid", project.workspaceFolder, () => {
@@ -162,7 +162,7 @@ export class CommandPaletteHandler {
     public static runIos(target: TargetType = "simulator"): Q.Promise<void> {
         return this.selectProject()
             .then((project: IReactNativeProject) => {
-                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.workspaceFolder.uri.fsPath)
+                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.packager.getProjectPath())
                     .then(version => {
                         project.reactNativeVersion = version;
                         TargetPlatformHelper.checkTargetPlatformSupport("ios");
@@ -191,7 +191,7 @@ export class CommandPaletteHandler {
     public static runExponent(): Q.Promise<void> {
         return this.selectProject()
             .then((project: IReactNativeProject) => {
-                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.workspaceFolder.uri.fsPath)
+                return ReactNativeProjectHelper.getReactNativePackageVersionFromNodeModules(project.packager.getProjectPath())
                     .then(version => {
                         return this.loginToExponent(project)
                             .then(() => {