@codingame/monaco-vscode-localization-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1,2 +1,11 @@
-export * from 'vscode/service-override/localization';
-export { default } from 'vscode/service-override/localization';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export interface AvailableLanguage {
+    locale: string;
+    languageName?: string;
+}
+export interface LocalizationOptions {
+    setLocale(id: string): Promise<void>;
+    clearLocale(): Promise<void>;
+    availableLanguages: AvailableLanguage[];
+}
+export default function getServiceOverride(options: LocalizationOptions): IEditorOverrideServices;

package/index.js

@@ -1 +1,67 @@
-export { default } from './localization.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { LanguagePackBaseService } from '@codingame/monaco-vscode-47923ab1-c4c8-58b5-89ac-fa1b998eb5dd-common/vscode/vs/platform/languagePacks/common/languagePacks';
+import { ILanguagePackService } from 'vscode/vscode/vs/platform/languagePacks/common/languagePacks.service';
+import { ILocaleService } from 'vscode/vscode/vs/workbench/services/localization/common/locale.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { AbstractLocaleService } from './vscode/src/vs/workbench/services/localization/browser/localeService.js';
+import { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { setAvailableLocales, getBuiltInExtensionTranslationsUris } from 'vscode/l10n';
+import './vscode/src/vs/workbench/contrib/localization/browser/localization.contribution.js';
+
+let LocaleService = class LocaleService extends AbstractLocaleService {
+    constructor(options, dialogService, hostService, productService) {
+        super(dialogService, hostService, productService);
+        this.options = options;
+    }
+    async storeLocale(locale) {
+        if (locale == null) {
+            await this.options.clearLocale();
+        }
+        else {
+            await this.options.setLocale(locale);
+        }
+    }
+    async clearLocale() {
+        await this.options.clearLocale();
+    }
+};
+LocaleService = __decorate([
+    __param(1, IDialogService),
+    __param(2, IHostService),
+    __param(3, IProductService)
+], LocaleService);
+let LanguagePackService = class LanguagePackService extends LanguagePackBaseService {
+    constructor(options, extensionGalleryService) {
+        super(extensionGalleryService);
+        this.options = options;
+        setAvailableLocales(new Set(options.availableLanguages.map((lang) => lang.locale)));
+    }
+    async getAvailableLanguages() {
+        return this.options.availableLanguages.map(({ locale, languageName }) => {
+            return this.createQuickPickItem(locale, languageName);
+        });
+    }
+    async getInstalledLanguages() {
+        return [];
+    }
+    async getBuiltInExtensionTranslationsUri(id, language) {
+        const uri = getBuiltInExtensionTranslationsUris(language)?.[id];
+        return uri != null ? URI.parse(uri) : undefined;
+    }
+};
+LanguagePackService = __decorate([
+    __param(1, IExtensionGalleryService)
+], LanguagePackService);
+function getServiceOverride(options) {
+    return {
+        [ILocaleService.toString()]: new SyncDescriptor(LocaleService, [options], true),
+        [ILanguagePackService.toString()]: new SyncDescriptor(LanguagePackService, [options], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-localization-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - localization service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,12 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - localization service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-47923ab1-c4c8-58b5-89ac-fa1b998eb5dd-common": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +28,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

package/vscode/src/vs/workbench/contrib/localization/browser/localization.contribution.d.ts

@@ -0,0 +1,3 @@
+import { BaseLocalizationWorkbenchContribution } from "../common/localization.contribution.js";
+export declare class WebLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchContribution {
+}

package/vscode/src/vs/workbench/contrib/localization/browser/localization.contribution.js

@@ -1,10 +1,12 @@
+
 import { BaseLocalizationWorkbenchContribution } from '../common/localization.contribution.js';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 class WebLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchContribution {
 }
 const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(WebLocalizationWorkbenchContribution, 4 );
+workbenchRegistry.registerWorkbenchContribution(WebLocalizationWorkbenchContribution, LifecyclePhase.Eventually);
 
 export { WebLocalizationWorkbenchContribution };

package/vscode/src/vs/workbench/contrib/localization/common/localization.contribution.d.ts

@@ -0,0 +1,5 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+export declare class BaseLocalizationWorkbenchContribution extends Disposable implements IWorkbenchContribution {
+    constructor();
+}

package/vscode/src/vs/workbench/contrib/localization/common/localization.contribution.js

@@ -1,3 +1,4 @@
+
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -16,7 +17,7 @@ class BaseLocalizationWorkbenchContribution extends Disposable {
             extensionPoint: 'localizations',
             defaultExtensionKind: ['ui', 'workspace'],
             jsonSchema: {
-                description: ( localize(7764, "Contributes localizations to the editor")),
+                description: ( localize(6996, "Contributes localizations to the editor")),
                 type: 'array',
                 default: [],
                 items: {
@@ -25,19 +26,19 @@ class BaseLocalizationWorkbenchContribution extends Disposable {
                     defaultSnippets: [{ body: { languageId: '', languageName: '', localizedLanguageName: '', translations: [{ id: 'vscode', path: '' }] } }],
                     properties: {
                         languageId: {
-                            description: ( localize(7765, 'Id of the language into which the display strings are translated.')),
+                            description: ( localize(6997, 'Id of the language into which the display strings are translated.')),
                             type: 'string'
                         },
                         languageName: {
-                            description: ( localize(7766, 'Name of the language in English.')),
+                            description: ( localize(6998, 'Name of the language in English.')),
                             type: 'string'
                         },
                         localizedLanguageName: {
-                            description: ( localize(7767, 'Name of the language in contributed language.')),
+                            description: ( localize(6999, 'Name of the language in contributed language.')),
                             type: 'string'
                         },
                         translations: {
-                            description: ( localize(7768, 'List of translations associated to the language.')),
+                            description: ( localize(7000, 'List of translations associated to the language.')),
                             type: 'array',
                             default: [{ id: 'vscode', path: '' }],
                             items: {
@@ -47,19 +48,19 @@ class BaseLocalizationWorkbenchContribution extends Disposable {
                                     id: {
                                         type: 'string',
                                         description: ( localize(
-                                            7769,
+                                            7001,
                                             "Id of VS Code or Extension for which this translation is contributed to. Id of VS Code is always `vscode` and of extension should be in format `publisherId.extensionName`."
                                         )),
                                         pattern: '^((vscode)|([a-z0-9A-Z][a-z0-9A-Z-]*)\\.([a-z0-9A-Z][a-z0-9A-Z-]*))$',
                                         patternErrorMessage: ( localize(
-                                            7770,
+                                            7002,
                                             "Id should be `vscode` or in format `publisherId.extensionName` for translating VS code or an extension respectively."
                                         ))
                                     },
                                     path: {
                                         type: 'string',
                                         description: ( localize(
-                                            7771,
+                                            7003,
                                             "A relative path to a file containing translations for the language."
                                         ))
                                     }
@@ -87,11 +88,11 @@ class LocalizationsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(7772, "Language ID")),
-            ( localize(7773, "Language Name")),
-            ( localize(7774, "Language Name (Localized)")),
+            ( localize(7004, "Language ID")),
+            ( localize(7005, "Language Name")),
+            ( localize(7006, "Language Name (Localized)")),
         ];
-        const rows = ( (localizations
+        const rows = ( localizations
             .sort((a, b) => a.languageId.localeCompare(b.languageId))
             .map(localization => {
             return [
@@ -99,7 +100,7 @@ class LocalizationsDataRenderer extends Disposable {
                 localization.languageName ?? '',
                 localization.localizedLanguageName ?? ''
             ];
-        })));
+        }));
         return {
             data: {
                 headers,
@@ -109,13 +110,13 @@ class LocalizationsDataRenderer extends Disposable {
         };
     }
 }
-( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'localizations',
-    label: ( localize(7775, "Langauage Packs")),
+    label: ( localize(7007, "Langauage Packs")),
     access: {
         canToggle: false
     },
-    renderer: ( (new SyncDescriptor(LocalizationsDataRenderer))),
+    renderer: ( new SyncDescriptor(LocalizationsDataRenderer)),
 });
 
 export { BaseLocalizationWorkbenchContribution };

package/vscode/src/vs/workbench/contrib/localization/common/localizationsActions.d.ts

@@ -0,0 +1,14 @@
+import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class ConfigureDisplayLanguageAction extends Action2 {
+    static readonly ID = "workbench.action.configureLocale";
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+    private withMoreInfoButton;
+}
+export declare class ClearDisplayLanguageAction extends Action2 {
+    static readonly ID = "workbench.action.clearLocalePreference";
+    static readonly LABEL: import("vscode/vscode/vs/nls").ILocalizedString;
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/localization/common/localizationsActions.js

@@ -1,3 +1,4 @@
+
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
@@ -12,13 +13,13 @@ class ConfigureDisplayLanguageAction extends Action2 {
     constructor() {
         super({
             id: ConfigureDisplayLanguageAction.ID,
-            title: ( localize2(10887, "Configure Display Language")),
+            title: ( localize2(7008, "Configure Display Language")),
             menu: {
                 id: MenuId.CommandPalette
             },
             metadata: {
                 description: ( localize2(
-                    10888,
+                    7009,
                     "Changes the locale of VS Code based on installed language packs. Common languages include French, Chinese, Spanish, Japanese, German, Korean, and more."
                 ))
             }
@@ -30,26 +31,26 @@ class ConfigureDisplayLanguageAction extends Action2 {
         const localeService = accessor.get(ILocaleService);
         const extensionWorkbenchService = accessor.get(IExtensionsWorkbenchService);
         const installedLanguages = await languagePackService.getInstalledLanguages();
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const qp = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
         qp.matchOnDescription = true;
-        qp.placeholder = ( localize(10889, "Select Display Language"));
+        qp.placeholder = ( localize(7010, "Select Display Language"));
         if (installedLanguages?.length) {
-            const items = [{ type: 'separator', label: ( localize(10890, "Installed")) }];
+            const items = [{ type: 'separator', label: ( localize(7011, "Installed")) }];
             qp.items = items.concat(this.withMoreInfoButton(installedLanguages));
         }
-        const source = ( (new CancellationTokenSource()));
+        const source = ( new CancellationTokenSource());
         disposables.add(qp.onDispose(() => {
             source.cancel();
             disposables.dispose();
         }));
-        const installedSet = ( (new Set(installedLanguages?.map(language => language.id) ?? [])));
+        const installedSet = ( new Set(installedLanguages?.map(language => language.id) ?? []));
         languagePackService.getAvailableLanguages().then(availableLanguages => {
-            const newLanguages = availableLanguages.filter(l => l.id && !( (installedSet.has(l.id))));
+            const newLanguages = availableLanguages.filter(l => l.id && !( installedSet.has(l.id)));
             if (newLanguages.length) {
                 qp.items = [
                     ...qp.items,
-                    { type: 'separator', label: ( localize(10891, "Available")) },
+                    { type: 'separator', label: ( localize(7012, "Available")) },
                     ...this.withMoreInfoButton(newLanguages)
                 ];
             }
@@ -75,7 +76,7 @@ class ConfigureDisplayLanguageAction extends Action2 {
         for (const item of items) {
             if (item.extensionId) {
                 item.buttons = [{
-                        tooltip: ( localize(10892, "More Info")),
+                        tooltip: ( localize(7013, "More Info")),
                         iconClass: 'codicon-info'
                     }];
             }
@@ -85,7 +86,7 @@ class ConfigureDisplayLanguageAction extends Action2 {
 }
 class ClearDisplayLanguageAction extends Action2 {
     static { this.ID = 'workbench.action.clearLocalePreference'; }
-    static { this.LABEL = ( localize2(10893, "Clear Display Language Preference")); }
+    static { this.LABEL = ( localize2(7014, "Clear Display Language Preference")); }
     constructor() {
         super({
             id: ClearDisplayLanguageAction.ID,

package/vscode/src/vs/workbench/services/localization/browser/localeService.d.ts

@@ -0,0 +1,30 @@
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { ILanguagePackItem } from "@codingame/monaco-vscode-47923ab1-c4c8-58b5-89ac-fa1b998eb5dd-common/vscode/vs/platform/languagePacks/common/languagePacks";
+import { IActiveLanguagePackService } from "vscode/vscode/vs/workbench/services/localization/common/locale.service";
+import { ILocaleService } from "vscode/vscode/vs/workbench/services/localization/common/locale.service";
+import { IHostService } from "vscode/vscode/vs/workbench/services/host/browser/host.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IExtensionGalleryService } from "vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare abstract class AbstractLocaleService implements ILocaleService {
+    private readonly dialogService;
+    private readonly hostService;
+    private readonly productService;
+    readonly _serviceBrand: undefined;
+    constructor(dialogService: IDialogService, hostService: IHostService, productService: IProductService);
+    abstract storeLocale(locale: string | undefined, extensionId: string | undefined): Promise<void>;
+    abstract clearLocale(): Promise<void>;
+    setLocale(languagePackItem: ILanguagePackItem, _skipDialog?: boolean): Promise<void>;
+    clearLocalePreference(): Promise<void>;
+}
+export declare class WebLocaleService extends AbstractLocaleService {
+    storeLocale(locale: string | undefined, extensionId: string | undefined): Promise<void>;
+    clearLocale(): Promise<void>;
+}
+export declare class WebActiveLanguagePackService implements IActiveLanguagePackService {
+    private readonly galleryService;
+    private readonly logService;
+    _serviceBrand: undefined;
+    constructor(galleryService: IExtensionGalleryService, logService: ILogService);
+    getExtensionIdProvidingCurrentLocale(): Promise<string | undefined>;
+}

package/vscode/src/vs/workbench/services/localization/browser/localeService.js

@@ -1,10 +1,12 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Language } from 'vscode/vscode/vs/base/common/platform';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/base/common/cancellation';
 
 new (class LocaleStorage {
@@ -49,16 +51,16 @@ let AbstractLocaleService = class AbstractLocaleService {
         const restartDialog = await this.dialogService.confirm({
             type: 'info',
             message: ( localize(
-                3287,
+                11657,
                 "To change the display language, {0} needs to reload",
                 this.productService.nameLong
             )),
             detail: ( localize(
-                3288,
+                11658,
                 "Press the reload button to refresh the page and set the display language to {0}.",
                 languagePackItem.label
             )),
-            primaryButton: ( localize(3289, "&&Reload")),
+            primaryButton: ( localize(11659, "&&Reload")),
         });
         if (restartDialog.confirmed) {
             this.hostService.restart();
@@ -72,25 +74,25 @@ let AbstractLocaleService = class AbstractLocaleService {
         const restartDialog = await this.dialogService.confirm({
             type: 'info',
             message: ( localize(
-                3290,
+                11660,
                 "To change the display language, {0} needs to reload",
                 this.productService.nameLong
             )),
             detail: ( localize(
-                3291,
+                11661,
                 "Press the reload button to refresh the page and use your browser's language."
             )),
-            primaryButton: ( localize(3289, "&&Reload")),
+            primaryButton: ( localize(11659, "&&Reload")),
         });
         if (restartDialog.confirmed) {
             this.hostService.restart();
         }
     }
 };
-AbstractLocaleService = ( (__decorate([
-    ( (__param(0, IDialogService))),
-    ( (__param(1, IHostService))),
-    ( (__param(2, IProductService)))
-], AbstractLocaleService)));
+AbstractLocaleService = ( __decorate([
+    ( __param(0, IDialogService)),
+    ( __param(1, IHostService)),
+    ( __param(2, IProductService))
+], AbstractLocaleService));
 
 export { AbstractLocaleService };

package/localization.js

@@ -1,66 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { LanguagePackBaseService } from 'vscode/vscode/vs/platform/languagePacks/common/languagePacks';
-import { ILanguagePackService } from 'vscode/vscode/vs/platform/languagePacks/common/languagePacks.service';
-import { ILocaleService } from 'vscode/vscode/vs/workbench/services/localization/common/locale.service';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { AbstractLocaleService } from './vscode/src/vs/workbench/services/localization/browser/localeService.js';
-import { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
-import { setAvailableLocales, getBuiltInExtensionTranslationsUris } from 'vscode/l10n';
-import './vscode/src/vs/workbench/contrib/localization/browser/localization.contribution.js';
-
-let LocaleService = class LocaleService extends AbstractLocaleService {
-    constructor(options, dialogService, hostService, productService) {
-        super(dialogService, hostService, productService);
-        this.options = options;
-    }
-    async storeLocale(locale) {
-        if (locale == null) {
-            await this.options.clearLocale();
-        }
-        else {
-            await this.options.setLocale(locale);
-        }
-    }
-    async clearLocale() {
-        await this.options.clearLocale();
-    }
-};
-LocaleService = __decorate([
-    ( __param(1, IDialogService)),
-    ( __param(2, IHostService)),
-    ( __param(3, IProductService))
-], LocaleService);
-let LanguagePackService = class LanguagePackService extends LanguagePackBaseService {
-    constructor(options, extensionGalleryService) {
-        super(extensionGalleryService);
-        this.options = options;
-        setAvailableLocales(new Set(( options.availableLanguages.map((lang) => lang.locale))));
-    }
-    async getAvailableLanguages() {
-        return ( this.options.availableLanguages.map(({ locale, languageName }) => {
-            return this.createQuickPickItem(locale, languageName);
-        }));
-    }
-    async getInstalledLanguages() {
-        return [];
-    }
-    async getBuiltInExtensionTranslationsUri(id, language) {
-        const uri = getBuiltInExtensionTranslationsUris(language)?.[id];
-        return uri != null ? ( URI.parse(uri)) : undefined;
-    }
-};
-LanguagePackService = __decorate([
-    ( __param(1, IExtensionGalleryService))
-], LanguagePackService);
-function getServiceOverride(options) {
-    return {
-        [( ILocaleService.toString())]: new SyncDescriptor(LocaleService, [options], true),
-        [( ILanguagePackService.toString())]: new SyncDescriptor(LanguagePackService, [options], true)
-    };
-}
-
-export { getServiceOverride as default };