Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Fix path mappings with remote debugging #624

Merged
merged 21 commits into from
Jul 10, 2018

Conversation

DonJayamanne
Copy link
Contributor

@DonJayamanne DonJayamanne commented Jul 9, 2018

Fixes #610

@karthiknadig Please get this PR locally and test at your end.
I have tested from

  • Mac -> Win
  • Win -> Mac
  • Mac -> Mac
  • Win -> Win

Please test this specific scenario #610 (comment)

Note: I'm not sure ~/GIT will work, you might want to use absolute paths.

I'll be working on system tests.

@karthiknadig
Copy link
Member

Tested this and it fixes the mapping issue.

@DonJayamanne DonJayamanne changed the title WIP - Fix path mappings with remote debugging Fix path mappings with remote debugging Jul 10, 2018
@karthiknadig
Copy link
Member

The wrapper.py change looks good. I see that you are still working on tests. Let me know when they are done.

@codecov-io
Copy link

codecov-io commented Jul 10, 2018

Codecov Report

Merging #624 into master will increase coverage by 0.13%.
The diff coverage is 47.36%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #624      +/-   ##
==========================================
+ Coverage   60.57%   60.71%   +0.13%     
==========================================
  Files          27       27              
  Lines        3792     3785       -7     
==========================================
+ Hits         2297     2298       +1     
+ Misses       1495     1487       -8
Impacted Files Coverage Δ
ptvsd/wrapper.py 52.89% <47.36%> (+0.33%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2b0140e...563f8f4. Read the comment docs.

ptvsd/wrapper.py Outdated
'WINDOWS_CLIENT',
platform.system() == 'Windows')
os_id = 'WINDOWS' if windows_client else 'UNIX'
default_os_type = 'WINDOWS' if sys.platform == 'win32' else 'UNIX'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sys.platform == 'win32' [](start = 39, length = 23)

platform.system()

@@ -45,7 +45,8 @@ contact [[email protected]](mailto:[email protected]) with any additio
"Jinja", // Enables Jinja (Flask) Template debugging
"FixFilePathCase", // See FIX_FILE_PATH_CASE in wrapper.py
"DebugStdLib" // Whether to enable debugging of standard library functions
"WindowsClient" // Whether client OS is Windows or not
"WindowsClient" // Whether client OS is Windows
"UnixClient" // Whether client OS is Unix
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UnixClient [](start = 13, length = 10)

This should be updated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, this is what VSC sends,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, got it.


In reply to: 201481855 [](ancestors = 201481855)

Copy link
Member

@karthiknadig karthiknadig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@DonJayamanne DonJayamanne merged commit 14982d9 into microsoft:master Jul 10, 2018
DonJayamanne added a commit to DonJayamanne/ptvsd that referenced this pull request Jul 11, 2018
@DonJayamanne DonJayamanne deleted the fixPathMappings branch July 14, 2018 22:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants