Allows settings to override language contributed bracket pair configurations.#134503
Merged
Conversation
Member
|
@hediet Could you please fix the tests. |
d9336b0 to
df994ef
Compare
alexdima
requested changes
Oct 11, 2021
alexdima
left a comment
Member
There was a problem hiding this comment.
I've left notes, we can also discuss.
| const openingBrackets = new Set</* openingText */ string>(); | ||
|
|
||
| for (const [openingText, closingText] of brackets) { | ||
| if (openingText === '' || closingText === '') { |
Member
There was a problem hiding this comment.
I suggest to move the validation of brackets (i.e. that empty brackets are not allowed to ResolvedLanguageConfiguration). Otherwise, we would need to check for empty strings in all consumers of ResolvedLanguageConfiguration.
| return this._brackets; | ||
| } | ||
| function getCustomizedLanguageConfig(languageIdentifier: LanguageIdentifier, resource: URI | undefined, configurationService: IConfigurationService): LanguageConfiguration { | ||
| // TODO how should these keys be registered to the JSON schema? |
Member
There was a problem hiding this comment.
You can define them together with the other non-editor options yet still editor.* settings at
alexdima
reviewed
Oct 11, 2021
| this.config = computeConfig(this.languageId, this.resource, this.configurationService, this.modeService); | ||
|
|
||
| this._register(this.configurationService.onDidChangeConfiguration((e) => { | ||
| this.update(); |
Member
There was a problem hiding this comment.
if (!e.affectsConfiguration('editor')) {
return;
}
Member
Author
There was a problem hiding this comment.
I do it like this now:
const customizedLanguageConfigKeys = {
brackets: 'editor.language.brackets',
colorizedBracketPairs: 'editor.language.colorizedBracketPairs'
};
// ...
const languageConfigKeys = new Set(Object.values(customizedLanguageConfigKeys));
const globalConfigChanged = e.change.keys.some((k) =>
languageConfigKeys.has(k)
);
const localConfigChanged = e.change.overrides
.filter(([overrideLangName, keys]) =>
keys.some((k) => languageConfigKeys.has(k))
)
.map(([overrideLangName]) => this.modeService.getLanguageIdentifier(overrideLangName));
if (globalConfigChanged) {
this.configurations.clear();
this.onDidChangeEmitter.fire(new LanguageConfigurationServiceChangeEvent(undefined));
} else {
for (const languageIdentifier of localConfigChanged) {
if (languageIdentifier) {
this.configurations.delete(languageIdentifier.id);
this.onDidChangeEmitter.fire(new LanguageConfigurationServiceChangeEvent(languageIdentifier));
}
}
}eeaa845 to
c3e8f38
Compare
10aef2b to
6650201
Compare
# Conflicts: # src/vs/editor/common/modes/languageConfigurationRegistry.ts
alexdima
requested changes
Oct 12, 2021
alexdima
left a comment
Member
There was a problem hiding this comment.
Looks very good! Just one last problem I just noticed.
| import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo'; | ||
| import { Iterable } from 'vs/base/common/iterator'; | ||
| import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService'; | ||
| import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService'; |
Member
There was a problem hiding this comment.
This is not a test, we should not use the TestLanguageConfigurationService here
alexdima
approved these changes
Oct 12, 2021
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.
2 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.
This PR fixes #131412
TODOs: