language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-17 02:42:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Making loadColors more readable by monading all the things.

Browse source
This commit is contained in:
Seivan Heidari 2019-10-31 11:26:39 +01:00
parent 1f822c8e51
commit a437f0e584
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
editors/code/src/scopes.ts
View file

@ -55,10 +55,10 @@ function loadThemeNamed(themeName: string) {
const themePaths = vscode.extensions.all const themePaths = vscode.extensions.all
.filter(filterThemeExtensions) .filter(filterThemeExtensions)
.reduce((list, extension) => { .reduce((list, extension) => {
const paths = extension.packageJSON.contributes.themes return extension.packageJSON.contributes.themes
.filter((element: any) => (element.id || element.label) === themeName) .filter((element: any) => (element.id || element.label) === themeName)
.map((element: any) => path.join(extension.extensionPath, element.path)) .map((element: any) => path.join(extension.extensionPath, element.path))
return list.concat(paths) .concat(list)
}, Array<string>()) }, Array<string>())
@ -92,7 +92,8 @@ function loadThemeFile(themePath: string) {
.forEach(loadThemeFile) .forEach(loadThemeFile)
} }
function mergeRuleSettings(defaultSetting: TextMateRuleSettings, override: TextMateRuleSettings): TextMateRuleSettings { function mergeRuleSettings(defaultSetting: TextMateRuleSettings | undefined, override: TextMateRuleSettings): TextMateRuleSettings {
if (defaultSetting === undefined) { return override }
const mergedRule = defaultSetting const mergedRule = defaultSetting
mergedRule.background = override.background || defaultSetting.background mergedRule.background = override.background || defaultSetting.background
@ -102,29 +103,21 @@ function mergeRuleSettings(defaultSetting: TextMateRuleSettings, override: TextM
return mergedRule return mergedRule
} }
function loadColors(textMateRules: TextMateRule[]): void { function updateRules(scope: string, updatedSettings: TextMateRuleSettings): void {
for (const rule of textMateRules) { [rules.get(scope)]
.map(settings => mergeRuleSettings(settings, updatedSettings))
.forEach(settings => rules.set(scope, settings))
}
function loadColors(textMateRules: TextMateRule[]): void {
textMateRules.forEach(rule => {
if (typeof rule.scope === 'string') { if (typeof rule.scope === 'string') {
const existingRule = rules.get(rule.scope) updateRules(rule.scope, rule.settings)
if (existingRule) {
rules.set(rule.scope, mergeRuleSettings(existingRule, rule.settings))
}
else {
rules.set(rule.scope, rule.settings)
}
} else if (rule.scope instanceof Array) {
for (const scope of rule.scope) {
const existingRule = rules.get(scope)
if (existingRule) {
rules.set(scope, mergeRuleSettings(existingRule, rule.settings))
}
else {
rules.set(scope, rule.settings)
}
}
} }
} else if (rule.scope instanceof Array) {
rule.scope.forEach(scope => updateRules(scope, rule.settings))
}
})
} }
function isFile(filePath: string): boolean { function isFile(filePath: string): boolean {