@codingame/monaco-vscode-theme-service-override 1.83.16 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-files-service-override": "1.83.16"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-files-service-override": "1.85.0-next.0"
   }
 }

package/vscode/src/vs/workbench/services/themes/browser/fileIconThemeData.js

@@ -5,6 +5,7 @@ import * as json from 'monaco-editor/esm/vs/base/common/json.js';
 import { ExtensionData } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMessages';
 import { asCSSUrl } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 
 class FileIconThemeData {
     static { this.STORAGE_KEY = 'iconThemeData'; }
@@ -223,6 +224,22 @@ class FileIconThemeLoader {
                         result.hasFolderIcons = true;
                     }
                 }
+                const rootFolderNames = associations.rootFolderNames;
+                if (rootFolderNames) {
+                    for (const key in rootFolderNames) {
+                        const name = key.toLowerCase();
+                        addSelector(`${qualifier} .${escapeCSS(name)}-root-name-folder-icon.rootfolder-icon::before`, rootFolderNames[key]);
+                        result.hasFolderIcons = true;
+                    }
+                }
+                const rootFolderNamesExpanded = associations.rootFolderNamesExpanded;
+                if (rootFolderNamesExpanded) {
+                    for (const key in rootFolderNamesExpanded) {
+                        const name = key.toLowerCase();
+                        addSelector(`${qualifier} ${expanded} .${escapeCSS(name)}-root-name-folder-icon.rootfolder-icon::before`, rootFolderNamesExpanded[key]);
+                        result.hasFolderIcons = true;
+                    }
+                }
                 const languageIds = associations.languageIds;
                 if (languageIds) {
                     if (!languageIds.jsonc && languageIds.json) {
@@ -351,7 +368,7 @@ function handleParentFolder(key, selectors) {
 }
 function escapeCSS(str) {
     str = str.replace(/[\11\12\14\15\40]/g, '/');
-    return window.CSS.escape(str);
+    return mainWindow.CSS.escape(str);
 }
 
 export { FileIconThemeData, FileIconThemeLoader };

package/vscode/src/vs/workbench/services/themes/browser/workbenchThemeService.js

@@ -35,6 +35,7 @@ import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/servi
 import { getIconsStyleSheet } from 'monaco-editor/esm/vs/platform/theme/browser/iconsStyleSheet.js';
 import { getColorRegistry, asCssVariableName } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 
 const PERSISTED_OS_COLOR_SCHEME = 'osColorScheme';
 const PERSISTED_OS_COLOR_SCHEME_SCOPE = -1 ;
@@ -69,7 +70,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.userDataInitializationService = userDataInitializationService;
         this.hasDefaultUpdated = false;
         this.themeExtensionsActivated = ( new Map());
-        this.container = layoutService.container;
+        this.container = layoutService.mainContainer;
         this.settings = ( new ThemeConfiguration(configurationService));
         this.colorThemeRegistry = ( new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme));
         this.colorThemeWatcher = ( new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this)));
@@ -738,13 +739,11 @@ class ThemeFileWatcher {
     }
 }
 function _applyRules(styleSheetContent, rulesClassName) {
-    const themeStyles = document.head.getElementsByClassName(rulesClassName);
+    const themeStyles = mainWindow.document.head.getElementsByClassName(rulesClassName);
     if (themeStyles.length === 0) {
-        const elStyle = document.createElement('style');
-        elStyle.type = 'text/css';
+        const elStyle = createStyleSheet();
         elStyle.className = rulesClassName;
         elStyle.textContent = styleSheetContent;
-        document.head.appendChild(elStyle);
     }
     else {
         themeStyles[0].textContent = styleSheetContent;

package/vscode/src/vs/workbench/services/themes/common/fileIconThemeSchema.js

@@ -33,6 +33,54 @@ const schema = {
                 'The default file icon, shown for all files that don\'t match any extension, filename or language id.'
             ))
         },
+        rootFolder: {
+            type: 'string',
+            description: ( nls.localizeWithPath(
+                'vs/workbench/services/themes/common/fileIconThemeSchema',
+                'schema.rootFolder',
+                'The folder icon for collapsed root folders, and if rootFolderExpanded is not set, also for expanded root folders.'
+            ))
+        },
+        rootFolderExpanded: {
+            type: 'string',
+            description: ( nls.localizeWithPath(
+                'vs/workbench/services/themes/common/fileIconThemeSchema',
+                'schema.rootFolderExpanded',
+                'The folder icon for expanded root folders. The expanded root folder icon is optional. If not set, the icon defined for root folder will be shown.'
+            ))
+        },
+        rootFolderNames: {
+            type: 'object',
+            description: ( nls.localizeWithPath(
+                'vs/workbench/services/themes/common/fileIconThemeSchema',
+                'schema.rootFolderNames',
+                'Associates root folder names to icons. The object key is the root folder name. No patterns or wildcards are allowed. Root folder name matching is case insensitive.'
+            )),
+            additionalProperties: {
+                type: 'string',
+                description: ( nls.localizeWithPath(
+                    'vs/workbench/services/themes/common/fileIconThemeSchema',
+                    'schema.folderName',
+                    'The ID of the icon definition for the association.'
+                ))
+            }
+        },
+        rootFolderNamesExpanded: {
+            type: 'object',
+            description: ( nls.localizeWithPath(
+                'vs/workbench/services/themes/common/fileIconThemeSchema',
+                'schema.rootFolderNamesExpanded',
+                'Associates root folder names to icons for expanded root folders. The object key is the root folder name. No patterns or wildcards are allowed. Root folder name matching is case insensitive.'
+            )),
+            additionalProperties: {
+                type: 'string',
+                description: ( nls.localizeWithPath(
+                    'vs/workbench/services/themes/common/fileIconThemeSchema',
+                    'schema.rootFolderNameExpanded',
+                    'The ID of the icon definition for the association.'
+                ))
+            }
+        },
         folderNames: {
             type: 'object',
             description: ( nls.localizeWithPath(
@@ -131,6 +179,18 @@ const schema = {
                 folderNamesExpanded: {
                     $ref: '#/definitions/folderNamesExpanded'
                 },
+                rootFolder: {
+                    $ref: '#/definitions/rootFolder'
+                },
+                rootFolderExpanded: {
+                    $ref: '#/definitions/rootFolderExpanded'
+                },
+                rootFolderNames: {
+                    $ref: '#/definitions/rootFolderNames'
+                },
+                rootFolderNamesExpanded: {
+                    $ref: '#/definitions/rootFolderNamesExpanded'
+                },
                 fileExtensions: {
                     $ref: '#/definitions/fileExtensions'
                 },
@@ -311,6 +371,18 @@ const schema = {
         folderNamesExpanded: {
             $ref: '#/definitions/folderNamesExpanded'
         },
+        rootFolder: {
+            $ref: '#/definitions/rootFolder'
+        },
+        rootFolderExpanded: {
+            $ref: '#/definitions/rootFolderExpanded'
+        },
+        rootFolderNames: {
+            $ref: '#/definitions/rootFolderNames'
+        },
+        rootFolderNamesExpanded: {
+            $ref: '#/definitions/rootFolderNamesExpanded'
+        },
         fileExtensions: {
             $ref: '#/definitions/fileExtensions'
         },

package/vscode/src/vs/workbench/services/themes/common/themeConfiguration.js

@@ -184,7 +184,7 @@ const detectHCSchemeSettingSchema = {
     markdownDescription: ( nls.localizeWithPath(
         'vs/workbench/services/themes/common/themeConfiguration',
         { key: 'autoDetectHighContrast', comment: ['{0} and {1} will become links to other settings.'] },
-        "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by {0} and {1}",
+        "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by {0} and {1}.",
         formatSettingAsLink(ThemeSettings.PREFERRED_HC_DARK_THEME),
         formatSettingAsLink(ThemeSettings.PREFERRED_HC_LIGHT_THEME)
     )),