Provide feedback on malformed JSON of argv.json #151659
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
TylerLeonhardt
commented
Jun 9, 2022
src/vs/workbench/services/configuration/common/jsonEditingService.ts
Outdated
Show resolved
Hide resolved
joyceerhl
previously approved these changes
Jun 9, 2022
bpasero
requested changes
Jun 10, 2022
src/vs/workbench/services/configuration/common/jsonEditingService.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/services/configuration/common/jsonEditingService.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/services/configuration/common/jsonEditingService.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/contrib/localization/electron-sandbox/localeService.ts
Outdated
Show resolved
Hide resolved
TylerLeonhardt
force-pushed
the
tyler/more-feedback-on-malformed-argv
branch
from
0508f00
to
630b931
Compare
bpasero
requested changes
Jun 13, 2022
src/vs/workbench/contrib/localization/electron-sandbox/localeService.ts
Outdated
Show resolved
Hide resolved
| private async writeLocaleValue(locale: string | undefined): Promise<boolean> { | ||
| try { | ||
|
|
||
| const content = await this.textFileService.read(this.environmentService.argvResource, { encoding: 'utf8' }); |
There was a problem hiding this comment.
This is more 💄 , but reading this method writeLocalValue I might be confused at first as to why we read the file. How about moving this new block of code into a private method validateLocaleFile (or similar) so that the logic becomes clearer as to why we read the file before writing?
| } catch (error) { | ||
| this.notificationService.notify({ | ||
| severity: Severity.Error, | ||
| message: localize('argvInvalid', 'Your argv.json file is not valid. Please open it and fix any parse errors so that your display language can be set properly.'), |
There was a problem hiding this comment.
Maybe we can make this more user friendly: the fact that we store the locale in a file argv.json is not so important imho. In the end I would just indicate that the settings file where we store the locale is malformed and needs manual fixing.
I think settings editor has a similar error notification, maybe we can borrow the wording.
There was a problem hiding this comment.
riffed off
ubaisa
previously approved these changes
Jun 13, 2022
TylerLeonhardt
force-pushed
the
tyler/more-feedback-on-malformed-argv
branch
from
d90d313
to
4ef61e8
Compare
TylerLeonhardt
force-pushed
the
tyler/more-feedback-on-malformed-argv
branch
from
4ef61e8
to
8d4d2a7
Compare
bpasero
approved these changes
Jun 14, 2022
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.
This PR fixes #151200