diff options
Diffstat (limited to 'editors/code/src/scopes.ts')
-rw-r--r-- | editors/code/src/scopes.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/code/src/scopes.ts b/editors/code/src/scopes.ts index 8f288d761..cb250b853 100644 --- a/editors/code/src/scopes.ts +++ b/editors/code/src/scopes.ts | |||
@@ -58,10 +58,10 @@ function loadThemeNamed(themeName: string) { | |||
58 | return extension.packageJSON.contributes.themes | 58 | return extension.packageJSON.contributes.themes |
59 | .filter( | 59 | .filter( |
60 | (element: any) => | 60 | (element: any) => |
61 | (element.id || element.label) === themeName | 61 | (element.id || element.label) === themeName, |
62 | ) | 62 | ) |
63 | .map((element: any) => | 63 | .map((element: any) => |
64 | path.join(extension.extensionPath, element.path) | 64 | path.join(extension.extensionPath, element.path), |
65 | ) | 65 | ) |
66 | .concat(list); | 66 | .concat(list); |
67 | }, Array<string>()); | 67 | }, Array<string>()); |
@@ -71,7 +71,7 @@ function loadThemeNamed(themeName: string) { | |||
71 | const tokenColorCustomizations: [any] = [ | 71 | const tokenColorCustomizations: [any] = [ |
72 | vscode.workspace | 72 | vscode.workspace |
73 | .getConfiguration('editor') | 73 | .getConfiguration('editor') |
74 | .get('tokenColorCustomizations') | 74 | .get('tokenColorCustomizations'), |
75 | ]; | 75 | ]; |
76 | 76 | ||
77 | tokenColorCustomizations | 77 | tokenColorCustomizations |
@@ -100,7 +100,7 @@ function loadThemeFile(themePath: string) { | |||
100 | 100 | ||
101 | function mergeRuleSettings( | 101 | function mergeRuleSettings( |
102 | defaultSetting: TextMateRuleSettings | undefined, | 102 | defaultSetting: TextMateRuleSettings | undefined, |
103 | override: TextMateRuleSettings | 103 | override: TextMateRuleSettings, |
104 | ): TextMateRuleSettings { | 104 | ): TextMateRuleSettings { |
105 | if (defaultSetting === undefined) { | 105 | if (defaultSetting === undefined) { |
106 | return override; | 106 | return override; |
@@ -116,7 +116,7 @@ function mergeRuleSettings( | |||
116 | 116 | ||
117 | function updateRules( | 117 | function updateRules( |
118 | scope: string, | 118 | scope: string, |
119 | updatedSettings: TextMateRuleSettings | 119 | updatedSettings: TextMateRuleSettings, |
120 | ): void { | 120 | ): void { |
121 | [rules.get(scope)] | 121 | [rules.get(scope)] |
122 | .map(settings => mergeRuleSettings(settings, updatedSettings)) | 122 | .map(settings => mergeRuleSettings(settings, updatedSettings)) |