@theia/monaco 1.34.1 → 1.34.3

package/lib/browser/monaco-formatting-conflicts.d.ts

@@ -1,14 +1,14 @@
-import { PreferenceService, FrontendApplicationContribution, PreferenceLanguageOverrideService } from '@theia/core/lib/browser';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { MonacoQuickInputService } from './monaco-quick-input-service';
-export declare class MonacoFormattingConflictsContribution implements FrontendApplicationContribution {
-    protected readonly monacoQuickInputService: MonacoQuickInputService;
-    protected readonly preferenceService: PreferenceService;
-    protected readonly preferenceSchema: PreferenceLanguageOverrideService;
-    protected readonly editorManager: EditorManager;
-    initialize(): Promise<void>;
-    protected setDefaultFormatter(language: string, formatter: string): Promise<void>;
-    private getDefaultFormatter;
-    private selectFormatter;
-}
+import { PreferenceService, FrontendApplicationContribution, PreferenceLanguageOverrideService } from '@theia/core/lib/browser';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { MonacoQuickInputService } from './monaco-quick-input-service';
+export declare class MonacoFormattingConflictsContribution implements FrontendApplicationContribution {
+    protected readonly monacoQuickInputService: MonacoQuickInputService;
+    protected readonly preferenceService: PreferenceService;
+    protected readonly preferenceSchema: PreferenceLanguageOverrideService;
+    protected readonly editorManager: EditorManager;
+    initialize(): Promise<void>;
+    protected setDefaultFormatter(language: string, formatter: string): Promise<void>;
+    private getDefaultFormatter;
+    private selectFormatter;
+}
 //# sourceMappingURL=monaco-formatting-conflicts.d.ts.map

package/lib/browser/monaco-formatting-conflicts.js

@@ -1,111 +1,111 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonacoFormattingConflictsContribution = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const browser_1 = require("@theia/core/lib/browser");
-const browser_2 = require("@theia/editor/lib/browser");
-const monaco_quick_input_service_1 = require("./monaco-quick-input-service");
-const format_1 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/format/browser/format");
-const PREFERENCE_NAME = 'editor.defaultFormatter';
-let MonacoFormattingConflictsContribution = class MonacoFormattingConflictsContribution {
-    async initialize() {
-        format_1.FormattingConflicts.setFormatterSelector((formatters, document, mode) => this.selectFormatter(formatters, document, mode));
-    }
-    async setDefaultFormatter(language, formatter) {
-        const name = this.preferenceSchema.overridePreferenceName({
-            preferenceName: PREFERENCE_NAME,
-            overrideIdentifier: language
-        });
-        await this.preferenceService.set(name, formatter);
-    }
-    getDefaultFormatter(language) {
-        const name = this.preferenceSchema.overridePreferenceName({
-            preferenceName: PREFERENCE_NAME,
-            overrideIdentifier: language
-        });
-        return this.preferenceService.get(name);
-    }
-    async selectFormatter(formatters, document, mode) {
-        if (formatters.length === 0) {
-            return undefined;
-        }
-        if (formatters.length === 1) {
-            return formatters[0];
-        }
-        const currentEditor = this.editorManager.currentEditor;
-        if (!currentEditor) {
-            return undefined;
-        }
-        const languageId = currentEditor.editor.document.languageId;
-        const defaultFormatterId = this.getDefaultFormatter(languageId);
-        if (defaultFormatterId) {
-            const formatter = formatters.find(f => f.extensionId && f.extensionId.value === defaultFormatterId);
-            if (formatter) {
-                return formatter;
-            }
-        }
-        return new Promise(async (resolve, reject) => {
-            const items = formatters
-                .filter(formatter => formatter.displayName)
-                .map(formatter => ({
-                label: formatter.displayName,
-                detail: formatter.extensionId ? formatter.extensionId.value : undefined,
-                value: formatter,
-            }))
-                .sort((a, b) => a.label.localeCompare(b.label));
-            const selectedFormatter = await this.monacoQuickInputService.showQuickPick(items, { placeholder: 'Select formatter for the current document' });
-            if (selectedFormatter) {
-                this.setDefaultFormatter(languageId, selectedFormatter.detail ? selectedFormatter.detail : '');
-                resolve(selectedFormatter.value);
-            }
-            else {
-                resolve(undefined);
-            }
-        });
-    }
-};
-__decorate([
-    (0, inversify_1.inject)(monaco_quick_input_service_1.MonacoQuickInputService),
-    __metadata("design:type", monaco_quick_input_service_1.MonacoQuickInputService)
-], MonacoFormattingConflictsContribution.prototype, "monacoQuickInputService", void 0);
-__decorate([
-    (0, inversify_1.inject)(browser_1.PreferenceService),
-    __metadata("design:type", Object)
-], MonacoFormattingConflictsContribution.prototype, "preferenceService", void 0);
-__decorate([
-    (0, inversify_1.inject)(browser_1.PreferenceLanguageOverrideService),
-    __metadata("design:type", browser_1.PreferenceLanguageOverrideService)
-], MonacoFormattingConflictsContribution.prototype, "preferenceSchema", void 0);
-__decorate([
-    (0, inversify_1.inject)(browser_2.EditorManager),
-    __metadata("design:type", browser_2.EditorManager)
-], MonacoFormattingConflictsContribution.prototype, "editorManager", void 0);
-MonacoFormattingConflictsContribution = __decorate([
-    (0, inversify_1.injectable)()
-], MonacoFormattingConflictsContribution);
-exports.MonacoFormattingConflictsContribution = MonacoFormattingConflictsContribution;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2020 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonacoFormattingConflictsContribution = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const browser_1 = require("@theia/core/lib/browser");
+const browser_2 = require("@theia/editor/lib/browser");
+const monaco_quick_input_service_1 = require("./monaco-quick-input-service");
+const format_1 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/format/browser/format");
+const PREFERENCE_NAME = 'editor.defaultFormatter';
+let MonacoFormattingConflictsContribution = class MonacoFormattingConflictsContribution {
+    async initialize() {
+        format_1.FormattingConflicts.setFormatterSelector((formatters, document, mode) => this.selectFormatter(formatters, document, mode));
+    }
+    async setDefaultFormatter(language, formatter) {
+        const name = this.preferenceSchema.overridePreferenceName({
+            preferenceName: PREFERENCE_NAME,
+            overrideIdentifier: language
+        });
+        await this.preferenceService.set(name, formatter);
+    }
+    getDefaultFormatter(language) {
+        const name = this.preferenceSchema.overridePreferenceName({
+            preferenceName: PREFERENCE_NAME,
+            overrideIdentifier: language
+        });
+        return this.preferenceService.get(name);
+    }
+    async selectFormatter(formatters, document, mode) {
+        if (formatters.length === 0) {
+            return undefined;
+        }
+        if (formatters.length === 1) {
+            return formatters[0];
+        }
+        const currentEditor = this.editorManager.currentEditor;
+        if (!currentEditor) {
+            return undefined;
+        }
+        const languageId = currentEditor.editor.document.languageId;
+        const defaultFormatterId = this.getDefaultFormatter(languageId);
+        if (defaultFormatterId) {
+            const formatter = formatters.find(f => f.extensionId && f.extensionId.value === defaultFormatterId);
+            if (formatter) {
+                return formatter;
+            }
+        }
+        return new Promise(async (resolve, reject) => {
+            const items = formatters
+                .filter(formatter => formatter.displayName)
+                .map(formatter => ({
+                label: formatter.displayName,
+                detail: formatter.extensionId ? formatter.extensionId.value : undefined,
+                value: formatter,
+            }))
+                .sort((a, b) => a.label.localeCompare(b.label));
+            const selectedFormatter = await this.monacoQuickInputService.showQuickPick(items, { placeholder: 'Select formatter for the current document' });
+            if (selectedFormatter) {
+                this.setDefaultFormatter(languageId, selectedFormatter.detail ? selectedFormatter.detail : '');
+                resolve(selectedFormatter.value);
+            }
+            else {
+                resolve(undefined);
+            }
+        });
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(monaco_quick_input_service_1.MonacoQuickInputService),
+    __metadata("design:type", monaco_quick_input_service_1.MonacoQuickInputService)
+], MonacoFormattingConflictsContribution.prototype, "monacoQuickInputService", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.PreferenceService),
+    __metadata("design:type", Object)
+], MonacoFormattingConflictsContribution.prototype, "preferenceService", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.PreferenceLanguageOverrideService),
+    __metadata("design:type", browser_1.PreferenceLanguageOverrideService)
+], MonacoFormattingConflictsContribution.prototype, "preferenceSchema", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_2.EditorManager),
+    __metadata("design:type", browser_2.EditorManager)
+], MonacoFormattingConflictsContribution.prototype, "editorManager", void 0);
+MonacoFormattingConflictsContribution = __decorate([
+    (0, inversify_1.injectable)()
+], MonacoFormattingConflictsContribution);
+exports.MonacoFormattingConflictsContribution = MonacoFormattingConflictsContribution;
 //# sourceMappingURL=monaco-formatting-conflicts.js.map

package/lib/browser/monaco-frontend-application-contribution.d.ts

@@ -1,27 +1,27 @@
-import { ColorTheme, CssStyleCollector, FrontendApplicationContribution, PreferenceSchemaProvider, QuickAccessRegistry, StylingParticipant } from '@theia/core/lib/browser';
-import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
-import { MonacoEditorService } from './monaco-editor-service';
-import { MonacoTextModelService } from './monaco-text-model-service';
-import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
-import { MonacoContextMenuService } from './monaco-context-menu';
-import { MonacoThemingService } from './monaco-theming-service';
-export declare class MonacoFrontendApplicationContribution implements FrontendApplicationContribution, StylingParticipant {
-    protected readonly codeEditorService: MonacoEditorService;
-    protected readonly textModelService: MonacoTextModelService;
-    protected readonly contextKeyService: VSCodeContextKeyService;
-    protected readonly snippetSuggestProvider: MonacoSnippetSuggestProvider;
-    protected readonly preferenceSchema: PreferenceSchemaProvider;
-    protected readonly quickAccessRegistry: QuickAccessRegistry;
-    protected readonly contextMenuService: MonacoContextMenuService;
-    protected readonly monacoThemingService: MonacoThemingService;
-    protected init(): void;
-    initialize(): void;
-    registerThemeStyle(theme: ColorTheme, collector: CssStyleCollector): void;
-    /**
-     * For reasons that are unclear, while most preferences that apply in editors are validated, a few are not.
-     * There is a utility in `examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts` to help determine which are not.
-     * Check `src/vs/editor/common/config/editorOptions.ts` for constructor arguments and to make sure that the preference names used to extract constructors are still accurate.
-     */
-    protected addAdditionalPreferenceValidations(): void;
-}
+import { ColorTheme, CssStyleCollector, FrontendApplicationContribution, PreferenceSchemaProvider, QuickAccessRegistry, StylingParticipant } from '@theia/core/lib/browser';
+import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
+import { MonacoEditorService } from './monaco-editor-service';
+import { MonacoTextModelService } from './monaco-text-model-service';
+import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
+import { MonacoContextMenuService } from './monaco-context-menu';
+import { MonacoThemingService } from './monaco-theming-service';
+export declare class MonacoFrontendApplicationContribution implements FrontendApplicationContribution, StylingParticipant {
+    protected readonly codeEditorService: MonacoEditorService;
+    protected readonly textModelService: MonacoTextModelService;
+    protected readonly contextKeyService: VSCodeContextKeyService;
+    protected readonly snippetSuggestProvider: MonacoSnippetSuggestProvider;
+    protected readonly preferenceSchema: PreferenceSchemaProvider;
+    protected readonly quickAccessRegistry: QuickAccessRegistry;
+    protected readonly contextMenuService: MonacoContextMenuService;
+    protected readonly monacoThemingService: MonacoThemingService;
+    protected init(): void;
+    initialize(): void;
+    registerThemeStyle(theme: ColorTheme, collector: CssStyleCollector): void;
+    /**
+     * For reasons that are unclear, while most preferences that apply in editors are validated, a few are not.
+     * There is a utility in `examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts` to help determine which are not.
+     * Check `src/vs/editor/common/config/editorOptions.ts` for constructor arguments and to make sure that the preference names used to extract constructors are still accurate.
+     */
+    protected addAdditionalPreferenceValidations(): void;
+}
 //# sourceMappingURL=monaco-frontend-application-contribution.d.ts.map