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

Making it clear we're using default settings.

Browse source
This commit is contained in:
Seivan Heidari 2019-10-24 18:33:36 +02:00
parent e6df4c424a
commit b59ffb7d41
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,17 +85,13 @@ function loadThemeFile(themePath: string) {
} }
} }
} }
function mergeRuleSettings(defaultRule: TextMateRuleSettings, override: TextMateRuleSettings): TextMateRuleSettings { function mergeRuleSettings(defaultSetting: TextMateRuleSettings, override: TextMateRuleSettings): TextMateRuleSettings {
const mergedRule = defaultRule; const mergedRule = defaultSetting;
if (override.background) {
mergedRule.background = override.background mergedRule.background = override.background || defaultSetting.background
} mergedRule.foreground = override.foreground || defaultSetting.foreground
if (override.foreground) { mergedRule.fontStyle = override.fontStyle || defaultSetting.foreground;
mergedRule.foreground = override.foreground
}
if (override.background) {
mergedRule.fontStyle = override.fontStyle
}
return mergedRule; return mergedRule;
} }