Skip to content

Commit 8d1c227

Browse files
author
Dimitar Tachev
authored
Merge pull request #253 from NativeScript/tachev/fix-eval-scripts-debugging
fix: return empty path for the evaluated scripts
2 parents 69600ea + 2629b2f commit 8d1c227

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/debug-adapter/nativeScriptPathTransformer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ export class NativeScriptPathTransformer extends UrlPathTransformer {
4646
relativePath = this.isAndroid ? matches[3] : matches[2];
4747
}
4848

49-
return this.getFileFromAppDir(relativePath) ||
49+
const result = this.getFileFromAppDir(relativePath) ||
5050
this.getFileFromNodeModulesDir(relativePath) ||
5151
this.getFileFromPlatformsDir(relativePath) ||
52-
scriptUrl;
52+
await super.targetUrlToClientPath(scriptUrl);
53+
54+
return result;
5355
}
5456

5557
private getFileFromAppDir(rawDevicePath: string): string {

src/tests/pathTransformData.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ const tests = [
77
scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/main.js',
88
},
99
{
10-
expectedResult: 'VM1',
10+
expectedResult: '',
1111
platform: 'android',
1212
scriptUrl: 'VM1',
1313
},
1414
{
15-
expectedResult: 'native prologue.js',
15+
expectedResult: '',
1616
platform: 'android',
1717
scriptUrl: 'native prologue.js',
1818
},
1919
{
20-
expectedResult: 'v8/gc',
20+
expectedResult: '',
2121
platform: 'android',
2222
scriptUrl: 'v8/gc',
2323
},
2424
{
25-
expectedResult: 'VM25',
25+
expectedResult: '',
2626
platform: 'android',
2727
scriptUrl: 'VM25',
2828
},
@@ -81,7 +81,7 @@ const tests = [
8181
scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/tns_modules/tns-core-modules/ui/layouts/layout-base.js',
8282
},
8383
{
84-
expectedResult: 'ng:///css/0/data/data/org.nativescript.TabNavigation/files/app/tabs/tabs.component.scss.ngstyle.js',
84+
expectedResult: '',
8585
platform: 'android',
8686
scriptUrl: 'ng:///css/0/data/data/org.nativescript.TabNavigation/files/app/tabs/tabs.component.scss.ngstyle.js',
8787
},

0 commit comments

Comments
 (0)