Fix prefer-object-spread in src/config#7354
Merged
thorn0 merged 4 commits intoprettier:nextfrom Jan 19, 2020
Merged
Conversation
44 tasks
fisker
commented
Jan 16, 2020
| function mergeOverrides(configResult, filePath) { | ||
| const options = Object.assign({}, configResult.config); | ||
| if (filePath && options.overrides) { | ||
| const { overrides, ...options } = { ...configResult.config }; |
Member
Author
There was a problem hiding this comment.
Notice: little refactor here.
fisker
changed the title
prefer-object-spread in /src/configprefer-object-spread in src/config
alexander-akait
approved these changes
Jan 16, 2020
thorn0
reviewed
Jan 18, 2020
| ); | ||
| const merged = { | ||
| ...editorConfigured, | ||
| ...mergeOverrides({ ...result }, filePath) |
Member
There was a problem hiding this comment.
Suggested change
| ...mergeOverrides({ ...result }, filePath) | |
| ...mergeOverrides(result, filePath) |
mergeOverrides doesn't modify this argument.
thorn0
approved these changes
Jan 19, 2020
fisker
force-pushed
the
style/prefer-object-spread-config
branch
from
ca81364 to
998985b
Compare
thorn0
reviewed
Jan 19, 2020
| ); | ||
| for (const override of options.overrides) { | ||
| const { config } = configResult || {}; | ||
| const { overrides, filepath: configPath, ...options } = config || {}; |
Member
There was a problem hiding this comment.
It was configResult.filepath, not configResult.config.filepath.
fisker
force-pushed
the
style/prefer-object-spread-config
branch
from
998985b to
be11403
Compare
lock
Bot
added
the
locked-due-to-inactivity
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Part of #7339