Fix indentation on single-liners and f-strings in type formatting #1312
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
DonJayamanne
approved these changes
Apr 5, 2018
src/client/extension.ts
Outdated
| @@ -75,7 +74,8 @@ export async function activate(context: ExtensionContext) { | |||
| const configuration = serviceManager.get<IConfigurationService>(IConfigurationService); | |||
| const pythonSettings = configuration.getSettings(); | |||
|
|
|||
| const activator: IExtensionActivator = IS_ANALYSIS_ENGINE_TEST || !pythonSettings.jediEnabled | |||
| const analysisEngineTest = process.env.VSC_PYTHON_ANALYSIS === '1'; | |||
There was a problem hiding this comment.
please move to src/client/common/constants.ts (that's where we have isTestExecution()
| @@ -108,7 +108,11 @@ export async function activate(context: ExtensionContext) { | |||
| languages.setLanguageConfiguration(PYTHON.language!, { | |||
| onEnterRules: [ | |||
| { | |||
| beforeText: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async)\b.*/, | |||
| beforeText: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except)\b.*:\s*\S+/, | |||
There was a problem hiding this comment.
I've created an issue (#1314) to ensure we try (some how) create tests to test this indentation. We've had to make changes to this area a number of times.
There was a problem hiding this comment.
Yeah, yet to figure out how to simulate typing in VSC.
Codecov Report
@@ Coverage Diff @@
## master #1312 +/- ##
==========================================
+ Coverage 71.08% 71.38% +0.29%
==========================================
Files 269 269
Lines 12383 12390 +7
Branches 2190 2196 +6
==========================================
+ Hits 8802 8844 +42
+ Misses 3449 3414 -35
Partials 132 132
Continue to review full report at Codecov.
|
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.
Fixes #1292
Fixes #1257
Fixes #726
This pull request: