Merge #3015

3015: vscode: yet another refactor commit r=matklad a=Veetaha

It compiles, it runs in dev extension host, It bundles, it runs when bundled and installed.
Removed 5 lines of code as you like less code, especially TypeScript code)

Co-authored-by: Veetaha <[email protected]>

1 files changed, 9 insertions, 9 deletions

diff --git a/editors/code/src/color_theme.ts b/editors/code/src/color_theme.ts
index 7e10c7f79..a6957a76e 100644
--- a/editors/code/src/color_theme.ts
+++ b/editors/code/src/color_theme.ts
@@ -33,6 +33,7 @@ export class ColorTheme {
                 : typeof rule.scope === 'string'
                     ? [rule.scope]
                     : rule.scope;
+
             for (const scope of scopes) {
                 res.rules.set(scope, rule.settings);
             }
@@ -69,13 +70,13 @@ function loadThemeNamed(themeName: string): ColorTheme {
         );
     }
 
-    const themePaths = vscode.extensions.all
+    const themePaths: string[] = vscode.extensions.all
         .filter(isTheme)
-        .flatMap(ext => {
-            return ext.packageJSON.contributes.themes
+        .flatMap(
+            ext => ext.packageJSON.contributes.themes
                 .filter((it: any) => (it.id || it.label) === themeName)
-                .map((it: any) => path.join(ext.extensionPath, it.path));
-        });
+                .map((it: any) => path.join(ext.extensionPath, it.path))
+        );
 
     const res = new ColorTheme();
     for (const themePath of themePaths) {
@@ -96,13 +97,12 @@ function loadThemeFile(themePath: string): ColorTheme {
         return new ColorTheme();
     }
     const obj = jsonc.parse(text);
-    const tokenColors = obj?.tokenColors ?? [];
+    const tokenColors: TextMateRule[] = obj?.tokenColors ?? [];
     const res = ColorTheme.fromRules(tokenColors);
 
-    for (const include in obj?.include ?? []) {
+    for (const include of obj?.include ?? []) {
         const includePath = path.join(path.dirname(themePath), include);
-        const tmp = loadThemeFile(includePath);
-        res.mergeFrom(tmp);
+        res.mergeFrom(loadThemeFile(includePath));
     }
 
     return res;