Use new environment variable parser #362
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Archive of 0.7.0
* 'master' of https://github.com/Microsoft/vscode-python: Fixes #56 list all environments (#219) Fixes #57 Disable activation on debugging (#220) Fixes #26 Do not run linters when linters are disabled (#222)
* upstream/master: Fix typo in README.md (#252) Disable linter without workspaces (#241)
* FixCodeExecInLinters: fix code review comments
* upstream/master: Fix linters to make use of the new python code execution framework (#360) Update the versioning scheme (#356) Make npm happy in regards to line endings (#357)
* master: Fix linters to make use of the new python code execution framework (#360) Update the versioning scheme (#356) Make npm happy in regards to line endings (#357)
* upstream/master: Ensure python path is not set if already set in user settings (#369) Use 'an' rather than 'a' before vowel words (#373)
* master: Ensure python path is not set if already set in user settings (#369) Use 'an' rather than 'a' before vowel words (#373)
|
@brettcannon @MikhailArkhipov could one of you please review this PR. |
|
@brettcannon , never mind will get Mikhail, forgot its friday. |
MikhailArkhipov
suggested changes
Dec 8, 2017
| @@ -120,10 +125,10 @@ export class LocalDebugClient extends DebugClient { | |||
| proc.on('error', error => { | |||
| // If debug server has started, then don't display errors. | |||
| // The debug adapter will get this info from the debugger (e.g. ptvsd lib). | |||
| if (!this.debugServer && this.debugServer.IsRunning) { | |||
| if (!this.debugServer && this.debugServer!.IsRunning) { | |||
There was a problem hiding this comment.
Not sure I understand the syntax. debugServer is undefined and it is also IsRunning? Should it be !this.debugServer || !this.debugServer!.IsRunning ?
| @@ -37,7 +37,7 @@ export class EnvironmentVariablesService implements IEnvironmentVariablesService | |||
| if (!target) { | |||
| return; | |||
| } | |||
| const pathVariable = this.isWidows ? WINDOWS_PATH_VARIABLE_NAME : NON_WINDOWS_PATH_VARIABLE_NAME; | |||
| const pathVariable = this.isWindows ? WINDOWS_PATH_VARIABLE_NAME : NON_WINDOWS_PATH_VARIABLE_NAME; | |||
There was a problem hiding this comment.
Might be worth making a small helper like getPathVeriableName()
There was a problem hiding this comment.
Agreed, now i can create the PathUtils class I've always wanted (to translate HOME and other environment varaibels and back)... for prettier displays of paths..
| @@ -193,12 +198,32 @@ export class LocalDebugClient extends DebugClient { | |||
| this.pyProc = proc; | |||
| resolve(); | |||
| }, error => { | |||
| if (!this.debugServer && this.debugServer.IsRunning) { | |||
| if (!this.debugServer && this.debugServer!.IsRunning) { | |||
There was a problem hiding this comment.
Also may be worth encapsulating the condition into a small helper function.
MikhailArkhipov
approved these changes
Dec 8, 2017
|
👍 |
DonJayamanne
added a commit
that referenced
this pull request
Dec 14, 2017
* upstream/master: Use new environment variable parser (#362)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.