Skip to content

Fix handling of escaped string in tokenizer + PTVS launch hardening #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
MikhailArkhipov merged 34 commits into from
Apr 12, 2018
Merged

Fix handling of escaped string in tokenizer + PTVS launch hardening #1377

MikhailArkhipov merged 34 commits into from
Apr 12, 2018

Conversation

@MikhailArkhipov
Copy link

@MikhailArkhipov MikhailArkhipov commented Apr 12, 2018

Fixes #1364

  • do not consider single-quoted string multiline even if it is not terminated

Harden language sever launch

  • handle case when assemblies are completely missing better

Match PTVS changes in microsoft/PTVS#4024

  • pass test flag differently and pass new async startup flags

This pull request:

  • Has a title summarizes what is changing
  • Has unit tests & code coverage is not adversely affected (within reason)
  • Works on all actively maintained versions of Python (e.g. Python 2.7 & the latest Python 3 release)
  • Works on Windows 10, macOS, and Linux (e.g. considered file system case-sensitivity)

MikhailArkhipov and others added 30 commits March 27, 2018 14:58
Undo changes
a764bc9
Test fixes
9d1b2cc
Increase timeout
a91291a
Remove double event listening
bf266af
Remove test
7bc6bd6
Revert "Remove test"
8ce8b48 
This reverts commit e240c3f.
Revert "Remove double event listening"
e3a549e 
This reverts commit af573be.
#1096 The if statement is automatically formatted incorrectly
92e8c1e
Merge fix
b540a1d
Add more tests
7b0573e
More tests
facb106
Typo
f113881
Test
3e76718
Also better handle multiline arguments
6e85dc6
@brettcannon
Add a couple missing periods
99e037c 
[skip ci]
Undo changes
3caeab7
Test fixes
eeb1f11
Increase timeout
f5f78c7
Remove double event listening
88744da
Remove test
65dde44
Revert "Remove test"
c513f71 
This reverts commit e240c3f.
Revert "Remove double event listening"
ccb3886 
This reverts commit af573be.
Merge fix
106f4db
Merge branch 'master' of https://github.com/MikhailArkhipov/vscode-py…
9e5cb43 
…thon
#1257 On type formatting errors for args and kwargs
e1da6a6
Handle f-strings
e78f0fb
Stop importing from test code
725cf71
#1308 Single line statements leading to an indentation on the next line
5cd6d45
#726 editing python after inline if statement invalid indent
27613db
Undo change
8061a20
DonJayamanne
DonJayamanne approved these changes Apr 12, 2018
View reviewed changes
src/client/activation/analysis.ts
class LanguageServerStartupErrorHandler implements ErrorHandler {
constructor(private readonly deferred: Deferred<void>) { }
public error(error: Error, message: Message, count: number): ErrorAction {
this.deferred.reject();
Copy link

@DonJayamanne DonJayamanne Apr 12, 2018

Choose a reason for hiding this comment

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

this.deferred.reject(error)

@codecov
Copy link

codecov bot commented Apr 12, 2018 •
edited
Loading

Codecov Report

Merging #1377 into master will decrease coverage by 0.3%.
The diff coverage is 22.22%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1377      +/-   ##
==========================================
- Coverage   71.45%   71.14%   -0.31%     
==========================================
  Files         269      269              
  Lines       12403    12416      +13     
  Branches     2199     2199              
==========================================
- Hits         8862     8833      -29     
- Misses       3411     3452      +41     
- Partials      130      131       +1
Impacted Files Coverage Δ
src/client/language/tokenizer.ts 96.8% <100%> (+0.02%) ⬆️
src/client/activation/analysis.ts 15.45% <12.5%> (-0.71%) ⬇️
src/client/linters/errorHandlers/notInstalled.ts 33.33% <0%> (-61.12%) ⬇️
src/client/linters/errorHandlers/errorHandler.ts 77.77% <0%> (-22.23%) ⬇️
src/client/common/logger.ts 53.33% <0%> (-20.01%) ⬇️
src/client/common/application/applicationShell.ts 23.07% <0%> (-7.7%) ⬇️
src/client/common/installer/productInstaller.ts 60.31% <0%> (-4.24%) ⬇️
src/client/linters/baseLinter.ts 87.5% <0%> (-4.17%) ⬇️
...reter/locators/services/cacheableLocatorService.ts 91.83% <0%> (-4.09%) ⬇️
...rc/client/debugger/PythonProcessCallbackHandler.ts 52.96% <0%> (-0.66%) ⬇️
... and 1 more

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 2027fce...6f7212c. Read the comment docs.

@MikhailArkhipov MikhailArkhipov merged commit cbe48a5 into microsoft:master Apr 12, 2018
@lock lock bot locked as resolved and limited conversation to collaborators Jul 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@DonJayamanne DonJayamanne DonJayamanne approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Intellisense doesn't work after specific const string

3 participants

@MikhailArkhipov @DonJayamanne @brettcannon