Remove getAppRoot and getBrowserPath from utilities

Author: ivanbuhov

src/debug-adapter/adapter/pathTransformer.ts

@@ -17,21 +17,21 @@ interface IPendingBreakpoint {
  * Converts a local path from Code to a path on the target.
  */
 export class PathTransformer implements DebugProtocol.IDebugTransformer {
-    private _webRoot: string;
+    private _appRoot: string;
     private _platform: string;
     private _clientPathToWebkitUrl = new Map<string, string>();
     private _webkitUrlToClientPath = new Map<string, string>();
     private _pendingBreakpointsByPath = new Map<string, IPendingBreakpoint>();
     private inferedDeviceRoot :string = null;
 
     public launch(args: DebugProtocol.ILaunchRequestArgs): void {
-        this._webRoot = utils.getAppRoot(args);
+        this._appRoot = args.appRoot;
         this._platform = args.platform;
         this.inferedDeviceRoot = (this._platform === 'ios') ? 'file://' : this.inferedDeviceRoot;
     }
 
     public attach(args: DebugProtocol.IAttachRequestArgs): void {
-        this._webRoot = utils.getAppRoot(args);
+        this._appRoot = args.appRoot;
         this._platform = args.platform;
     }
 
@@ -56,7 +56,7 @@ export class PathTransformer implements DebugProtocol.IDebugTransformer {
                 resolve();
             }
             else if (this.inferedDeviceRoot) {
-                let inferedUrl = url.replace(this._webRoot, this.inferedDeviceRoot).replace(/\\/g, "/");
+                let inferedUrl = url.replace(this._appRoot, this.inferedDeviceRoot).replace(/\\/g, "/");
 
                 //change device path if {N} core module or {N} module
                 if (inferedUrl.indexOf("/node_modules/tns-core-modules/") != -1)
@@ -96,7 +96,7 @@ export class PathTransformer implements DebugProtocol.IDebugTransformer {
         const webkitUrl: string = event.body.scriptUrl;
         if (!this.inferedDeviceRoot && this._platform === "android")
         {
-            this.inferedDeviceRoot = utils.inferDeviceRoot(this._webRoot, this._platform, webkitUrl);
+            this.inferedDeviceRoot = utils.inferDeviceRoot(this._appRoot, this._platform, webkitUrl);
              Logger.log("\n\n\n ***Inferred device root: " + this.inferedDeviceRoot + "\n\n\n");
 
             if (this.inferedDeviceRoot.indexOf("/data/user/0/") != -1)
@@ -105,12 +105,12 @@ export class PathTransformer implements DebugProtocol.IDebugTransformer {
             }
         }
 
-        const clientPath = utils.webkitUrlToClientPath(this._webRoot, this._platform, webkitUrl);
+        const clientPath = utils.webkitUrlToClientPath(this._appRoot, this._platform, webkitUrl);
 
         if (!clientPath) {
-            Logger.log(`Paths.scriptParsed: could not resolve ${webkitUrl} to a file in the workspace. webRoot: ${this._webRoot}`);
+            Logger.log(`Paths.scriptParsed: could not resolve ${webkitUrl} to a file in the workspace. webRoot: ${this._appRoot}`);
         } else {
-            Logger.log(`Paths.scriptParsed: resolved ${webkitUrl} to ${clientPath}. webRoot: ${this._webRoot}`);
+            Logger.log(`Paths.scriptParsed: resolved ${webkitUrl} to ${clientPath}. webRoot: ${this._appRoot}`);
             this._clientPathToWebkitUrl.set(clientPath, webkitUrl);
             this._webkitUrlToClientPath.set(webkitUrl, clientPath);
 
@@ -132,7 +132,7 @@ export class PathTransformer implements DebugProtocol.IDebugTransformer {
             if (frame.source && frame.source.path) {
                 const clientPath = this._webkitUrlToClientPath.has(frame.source.path) ?
                     this._webkitUrlToClientPath.get(frame.source.path) :
-                    utils.webkitUrlToClientPath(this._webRoot, this._platform, frame.source.path);
+                    utils.webkitUrlToClientPath(this._appRoot, this._platform, frame.source.path);
                 // Incoming stackFrames have sourceReference and path set. If the path was resolved to a file in the workspace,
                 // clear the sourceReference since it's not needed.
                 if (clientPath) {

src/debug-adapter/adapter/sourceMaps/sourceMapTransformer.ts

@@ -38,7 +38,7 @@ export class SourceMapTransformer implements DebugProtocol.IDebugTransformer {
 
     private init(args: DebugProtocol.ILaunchRequestArgs | DebugProtocol.IAttachRequestArgs): void {
         if (args.sourceMaps) {
-            this._webRoot = utils.getAppRoot(args);
+            this._webRoot = args.appRoot;
             this._sourceMaps = new SourceMaps(this._webRoot);
             this._requestSeqToSetBreakpointsArgs = new Map<number, DebugProtocol.ISetBreakpointsArgs>();
             this._allRuntimeScriptPaths = new Set<string>();

src/debug-adapter/utilities.ts

@@ -9,31 +9,6 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as url from 'url';
 import * as path from 'path';
-import {DebugProtocol} from 'vscode-debugprotocol';
-
-const DEFAULT_CHROME_PATH = {
-    OSX: '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-    WIN: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
-    WINx86: 'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
-    LINUX: '/usr/bin/google-chrome'
-};
-
-export function getBrowserPath(): string {
-    const platform = getPlatform();
-    if (platform === Platform.OSX) {
-        return existsSync(DEFAULT_CHROME_PATH.OSX) ? DEFAULT_CHROME_PATH.OSX : null;
-    } else if (platform === Platform.Windows) {
-        if (existsSync(DEFAULT_CHROME_PATH.WINx86)) {
-            return DEFAULT_CHROME_PATH.WINx86;
-        } else if (existsSync(DEFAULT_CHROME_PATH.WIN)) {
-            return DEFAULT_CHROME_PATH.WIN;
-        } else {
-            return null;
-        }
-    } else {
-        return existsSync(DEFAULT_CHROME_PATH.LINUX) ? DEFAULT_CHROME_PATH.LINUX : null;
-    }
-}
 
 export const enum Platform {
     Windows, OSX, Linux
@@ -364,13 +339,6 @@ export function errP(msg: any): Promise<any> {
     return Promise.reject(e);
 }
 
-/**
- * Calculates the appRoot from a launch/attach request. The appRoot is the root directory of the NativeScript app.
- */
-export function getAppRoot(args: DebugProtocol.ILaunchRequestArgs | DebugProtocol.IAttachRequestArgs): string {
-    return (args.appRoot && path.isAbsolute(args.appRoot)) ? args.appRoot : '';
-}
-
 /**
  * Helper function to GET the contents of a url
  */

src/debug-adapter/webKitDebugAdapter.ts

@@ -122,11 +122,11 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
     }
 
     private _attach(args: DebugProtocol.IAttachRequestArgs | DebugProtocol.ILaunchRequestArgs) {
-        ExtensionClient.setAppRoot(utils.getAppRoot(args));
+        ExtensionClient.setAppRoot(args.appRoot);
         let analyticsRequest = (args.request == "launch" && !(args as DebugProtocol.ILaunchRequestArgs).rebuild) ? "sync" : args.request;
         ExtensionClient.getInstance().analyticsLaunchDebugger({ request: analyticsRequest, platform: args.platform });
         this.configureLoggingForRequest(args.request, args);
-        this.appRoot = utils.getAppRoot(args);
+        this.appRoot = args.appRoot;
         this.platform = args.platform;
 
         return ((args.platform == 'ios') ? this._attachIos(args) : this._attachAndroid(args))