diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-21 10:23:10 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-21 10:23:10 +0000 |
commit | 88014fcec04721350abc156efb1e18889fca5255 (patch) | |
tree | e43d7323191a992fa8b604b245de333f130569b5 /editors/code/src/color_theme.ts | |
parent | 04dacb994349848873f9b2576d53685630883300 (diff) | |
parent | 28bf731751ecf248ea891b07c274dadcb3b7f157 (diff) |
Merge #3258
3258: enforce camel case r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src/color_theme.ts')
-rw-r--r-- | editors/code/src/color_theme.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/code/src/color_theme.ts b/editors/code/src/color_theme.ts index 2f2a39877..5b9327b28 100644 --- a/editors/code/src/color_theme.ts +++ b/editors/code/src/color_theme.ts | |||
@@ -83,11 +83,11 @@ function loadThemeNamed(themeName: string): ColorTheme { | |||
83 | res.mergeFrom(loadThemeFile(themePath)); | 83 | res.mergeFrom(loadThemeFile(themePath)); |
84 | } | 84 | } |
85 | 85 | ||
86 | const global_customizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations'); | 86 | const globalCustomizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations'); |
87 | res.mergeFrom(ColorTheme.fromRules(global_customizations?.textMateRules ?? [])); | 87 | res.mergeFrom(ColorTheme.fromRules(globalCustomizations?.textMateRules ?? [])); |
88 | 88 | ||
89 | const theme_customizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`); | 89 | const themeCustomizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`); |
90 | res.mergeFrom(ColorTheme.fromRules(theme_customizations?.textMateRules ?? [])); | 90 | res.mergeFrom(ColorTheme.fromRules(themeCustomizations?.textMateRules ?? [])); |
91 | 91 | ||
92 | 92 | ||
93 | return res; | 93 | return res; |