@theia/editor 1.26.0-next.9 → 1.26.0

package/lib/browser/language-status/editor-language-status-service.js

@@ -0,0 +1,252 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson 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);
+};
+var EditorLanguageStatusService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EditorLanguageStatusService = exports.LanguageStatusSeverity = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const browser_1 = require("@theia/core/lib/browser");
+const language_service_1 = require("@theia/core/lib/browser/language-service");
+const core_1 = require("@theia/core");
+const editor_command_1 = require("../editor-command");
+const language_selector_1 = require("../../common/language-selector");
+const uri_1 = require("@theia/core/lib/common/uri");
+const editor_manager_1 = require("../editor-manager");
+const severity_1 = require("@theia/core/lib/common/severity");
+const label_parser_1 = require("@theia/core/lib/browser/label-parser");
+/**
+ * Represents the severity of a language status item.
+ */
+var LanguageStatusSeverity;
+(function (LanguageStatusSeverity) {
+    LanguageStatusSeverity[LanguageStatusSeverity["Information"] = 0] = "Information";
+    LanguageStatusSeverity[LanguageStatusSeverity["Warning"] = 1] = "Warning";
+    LanguageStatusSeverity[LanguageStatusSeverity["Error"] = 2] = "Error";
+})(LanguageStatusSeverity = exports.LanguageStatusSeverity || (exports.LanguageStatusSeverity = {}));
+let EditorLanguageStatusService = EditorLanguageStatusService_1 = class EditorLanguageStatusService {
+    constructor() {
+        this.status = new Map();
+        this.pinnedCommands = new Set();
+    }
+    setLanguageStatusItem(handle, item) {
+        this.status.set(handle, item);
+        this.updateLanguageStatusItems();
+    }
+    removeLanguageStatusItem(handle) {
+        this.status.delete(handle);
+        this.updateLanguageStatusItems();
+    }
+    updateLanguageStatus(editor) {
+        if (!editor) {
+            this.statusBar.removeElement(EditorLanguageStatusService_1.LANGUAGE_MODE_ID);
+            return;
+        }
+        const language = this.languages.getLanguage(editor.document.languageId);
+        const languageName = language ? language.name : '';
+        this.statusBar.setElement(EditorLanguageStatusService_1.LANGUAGE_MODE_ID, {
+            text: languageName,
+            alignment: browser_1.StatusBarAlignment.RIGHT,
+            priority: 1,
+            command: editor_command_1.EditorCommands.CHANGE_LANGUAGE.id,
+            tooltip: core_1.nls.localizeByDefault('Select Language Mode')
+        });
+        this.updateLanguageStatusItems(editor);
+    }
+    updateLanguageStatusItems(editor = this.editorAccess.editor) {
+        if (!editor) {
+            this.statusBar.removeElement(EditorLanguageStatusService_1.LANGUAGE_STATUS_ID);
+            this.updatePinnedItems();
+            return;
+        }
+        const uri = new uri_1.default(editor.document.uri);
+        const items = Array.from(this.status.values())
+            .filter(item => (0, language_selector_1.score)(item.selector, uri.scheme, uri.path.toString(), editor.document.languageId, true))
+            .sort((left, right) => right.severity - left.severity);
+        if (!items.length) {
+            this.statusBar.removeElement(EditorLanguageStatusService_1.LANGUAGE_STATUS_ID);
+            return;
+        }
+        const severityText = items[0].severity === severity_1.Severity.Info
+            ? '$(bracket)'
+            : items[0].severity === severity_1.Severity.Warning
+                ? '$(bracket-dot)'
+                : '$(bracket-error)';
+        this.statusBar.setElement(EditorLanguageStatusService_1.LANGUAGE_STATUS_ID, {
+            text: severityText,
+            alignment: browser_1.StatusBarAlignment.RIGHT,
+            priority: 2,
+            tooltip: this.createTooltip(items),
+            affinity: { id: EditorLanguageStatusService_1.LANGUAGE_MODE_ID, alignment: browser_1.StatusBarAlignment.LEFT, compact: true },
+        });
+        this.updatePinnedItems(items);
+    }
+    updatePinnedItems(items) {
+        const toRemoveFromStatusBar = new Set(this.pinnedCommands);
+        items === null || items === void 0 ? void 0 : items.forEach(item => {
+            if (toRemoveFromStatusBar.has(item.id)) {
+                toRemoveFromStatusBar.delete(item.id);
+                this.statusBar.setElement(item.id, this.toPinnedItem(item));
+            }
+        });
+        toRemoveFromStatusBar.forEach(id => this.statusBar.removeElement(id));
+    }
+    toPinnedItem(item) {
+        return {
+            text: item.label,
+            affinity: { id: EditorLanguageStatusService_1.LANGUAGE_MODE_ID, alignment: browser_1.StatusBarAlignment.RIGHT, compact: false },
+            alignment: browser_1.StatusBarAlignment.RIGHT,
+            onclick: item.command && (e => { var _a, _b; e.preventDefault(); this.commandRegistry.executeCommand(item.command.id, ...((_b = (_a = item.command) === null || _a === void 0 ? void 0 : _a.arguments) !== null && _b !== void 0 ? _b : [])); }),
+        };
+    }
+    createTooltip(items) {
+        var _a, _b;
+        const hoverContainer = document.createElement('div');
+        hoverContainer.classList.add('hover-row');
+        for (const item of items) {
+            const itemContainer = document.createElement('div');
+            itemContainer.classList.add('hover-language-status');
+            {
+                const severityContainer = document.createElement('div');
+                severityContainer.classList.add('severity', `sev${item.severity}`);
+                severityContainer.classList.toggle('show', item.severity === severity_1.Severity.Error || item.severity === severity_1.Severity.Warning);
+                {
+                    const severityIcon = document.createElement('span');
+                    severityIcon.className = this.getSeverityIconClasses(item.severity);
+                    severityContainer.appendChild(severityIcon);
+                }
+                itemContainer.appendChild(severityContainer);
+            }
+            const textContainer = document.createElement('div');
+            textContainer.className = 'element';
+            const labelContainer = document.createElement('div');
+            labelContainer.className = 'left';
+            const label = document.createElement('span');
+            label.classList.add('label');
+            this.renderWithIcons(label, item.busy ? `$(sync~spin)\u00A0\u00A0${item.label}` : item.label);
+            labelContainer.appendChild(label);
+            const detail = document.createElement('span');
+            detail.classList.add('detail');
+            this.renderWithIcons(detail, item.detail);
+            labelContainer.appendChild(detail);
+            textContainer.appendChild(labelContainer);
+            const commandContainer = document.createElement('div');
+            commandContainer.classList.add('right');
+            if (item.command) {
+                const link = document.createElement('a');
+                link.classList.add('language-status-link');
+                link.href = new uri_1.default()
+                    .withScheme('command')
+                    .withPath(item.command.id)
+                    .withQuery(item.command.arguments ? encodeURIComponent(JSON.stringify(item.command.arguments)) : '')
+                    .toString(false);
+                link.onclick = e => { var _a, _b; e.preventDefault(); this.commandRegistry.executeCommand(item.command.id, ...((_b = (_a = item.command) === null || _a === void 0 ? void 0 : _a.arguments) !== null && _b !== void 0 ? _b : [])); };
+                link.textContent = (_a = item.command.title) !== null && _a !== void 0 ? _a : item.command.id;
+                link.title = (_b = item.command.tooltip) !== null && _b !== void 0 ? _b : '';
+                link.ariaRoleDescription = 'button';
+                link.ariaDisabled = 'false';
+                commandContainer.appendChild(link);
+                const pinContainer = document.createElement('div');
+                pinContainer.classList.add('language-status-action-bar');
+                const pin = document.createElement('a');
+                this.setPinProperties(pin, item.id);
+                pin.onclick = e => { e.preventDefault(); this.togglePinned(item); this.setPinProperties(pin, item.id); };
+                pinContainer.appendChild(pin);
+                commandContainer.appendChild(pinContainer);
+            }
+            textContainer.appendChild(commandContainer);
+            itemContainer.append(textContainer);
+            hoverContainer.appendChild(itemContainer);
+        }
+        return hoverContainer;
+    }
+    setPinProperties(pin, id) {
+        pin.className = this.pinnedCommands.has(id) ? (0, browser_1.codicon)('pinned', true) : (0, browser_1.codicon)('pin', true);
+        pin.ariaRoleDescription = 'button';
+        const pinText = this.pinnedCommands.has(id)
+            ? core_1.nls.localize('theia/editor/status-bar-unpin', 'Remove from Status Bar')
+            : core_1.nls.localize('theia/editor/status-bar-pin', 'Add to Status Bar');
+        pin.ariaLabel = pinText;
+        pin.title = pinText;
+    }
+    togglePinned(item) {
+        if (this.pinnedCommands.has(item.id)) {
+            this.pinnedCommands.delete(item.id);
+            this.statusBar.removeElement(item.id);
+        }
+        else {
+            this.pinnedCommands.add(item.id);
+            this.statusBar.setElement(item.id, this.toPinnedItem(item));
+        }
+    }
+    getSeverityIconClasses(severity) {
+        switch (severity) {
+            case severity_1.Severity.Error: return (0, browser_1.codicon)('error');
+            case severity_1.Severity.Warning: return (0, browser_1.codicon)('info');
+            default: return (0, browser_1.codicon)('check');
+        }
+    }
+    renderWithIcons(host, text) {
+        if (text) {
+            for (const chunk of this.labelParser.parse(text)) {
+                if (typeof chunk === 'string') {
+                    host.append(chunk);
+                }
+                else {
+                    const iconSpan = document.createElement('span');
+                    const className = (0, browser_1.codicon)(chunk.name) + (chunk.animation ? ` fa-${chunk.animation}` : '');
+                    iconSpan.className = className;
+                    host.append(iconSpan);
+                }
+            }
+        }
+    }
+};
+EditorLanguageStatusService.LANGUAGE_MODE_ID = 'editor-status-language';
+EditorLanguageStatusService.LANGUAGE_STATUS_ID = 'editor-language-status-items';
+__decorate([
+    (0, inversify_1.inject)(browser_1.StatusBar),
+    __metadata("design:type", Object)
+], EditorLanguageStatusService.prototype, "statusBar", void 0);
+__decorate([
+    (0, inversify_1.inject)(language_service_1.LanguageService),
+    __metadata("design:type", language_service_1.LanguageService)
+], EditorLanguageStatusService.prototype, "languages", void 0);
+__decorate([
+    (0, inversify_1.inject)(editor_manager_1.CurrentEditorAccess),
+    __metadata("design:type", editor_manager_1.CurrentEditorAccess)
+], EditorLanguageStatusService.prototype, "editorAccess", void 0);
+__decorate([
+    (0, inversify_1.inject)(core_1.CommandRegistry),
+    __metadata("design:type", core_1.CommandRegistry)
+], EditorLanguageStatusService.prototype, "commandRegistry", void 0);
+__decorate([
+    (0, inversify_1.inject)(label_parser_1.LabelParser),
+    __metadata("design:type", label_parser_1.LabelParser)
+], EditorLanguageStatusService.prototype, "labelParser", void 0);
+EditorLanguageStatusService = EditorLanguageStatusService_1 = __decorate([
+    (0, inversify_1.injectable)()
+], EditorLanguageStatusService);
+exports.EditorLanguageStatusService = EditorLanguageStatusService;
+//# sourceMappingURL=editor-language-status-service.js.map

package/lib/browser/language-status/editor-language-status-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editor-language-status-service.js","sourceRoot":"","sources":["../../../src/browser/language-status/editor-language-status-service.ts"],"names":[],"mappings":"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"}

package/lib/browser/quick-editor-service.d.ts

@@ -4,7 +4,7 @@ import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { OpenerService } from '@theia/core/lib/browser/opener-service';
 import { QuickAccessProvider, QuickAccessRegistry, QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
 import { QuickPickItem, QuickPickSeparator } from '@theia/core/lib/browser/quick-input/quick-input-service';
-import { EditorManager } from '.';
+import { EditorManager } from './editor-manager';
 export declare class QuickEditorService implements QuickAccessContribution, QuickAccessProvider {
     static PREFIX: string;
     protected readonly openerService: OpenerService;

package/lib/browser/quick-editor-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quick-editor-service.d.ts","sourceRoot":"","sources":["../../src/browser/quick-editor-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AACrI,OAAO,EAAe,aAAa,EAAE,kBAAkB,EAAE,MAAM,yDAAyD,CAAC;AACzH,OAAO,EAAE,aAAa,EAAgB,MAAM,GAAG,CAAC;AAEhD,qBACa,kBAAmB,YAAW,uBAAuB,EAAE,mBAAmB;IACnF,MAAM,CAAC,MAAM,SAAU;IAGvB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,2BAA2B,IAAI,IAAI;IASnC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,CAAC,aAAa,GAAG,kBAAkB,CAAC,EAAE;IAsB1F,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,aAAa;IAezC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAIrC"}
+{"version":3,"file":"quick-editor-service.d.ts","sourceRoot":"","sources":["../../src/browser/quick-editor-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AACrI,OAAO,EAAe,aAAa,EAAE,kBAAkB,EAAE,MAAM,yDAAyD,CAAC;AACzH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,qBACa,kBAAmB,YAAW,uBAAuB,EAAE,mBAAmB;IACnF,MAAM,CAAC,MAAM,SAAU;IAGvB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,2BAA2B,IAAI,IAAI;IASnC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,CAAC,aAAa,GAAG,kBAAkB,CAAC,EAAE;IAsB1F,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,aAAa;IAezC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAIrC"}

package/lib/browser/quick-editor-service.js

@@ -31,7 +31,7 @@ const label_provider_1 = require("@theia/core/lib/browser/label-provider");
 const opener_service_1 = require("@theia/core/lib/browser/opener-service");
 const quick_access_1 = require("@theia/core/lib/browser/quick-input/quick-access");
 const quick_input_service_1 = require("@theia/core/lib/browser/quick-input/quick-input-service");
-const _1 = require(".");
+const editor_manager_1 = require("./editor-manager");
 let QuickEditorService = QuickEditorService_1 = class QuickEditorService {
     registerQuickAccessProvider() {
         this.quickAccessRegistry.registerQuickAccessProvider({
@@ -68,7 +68,7 @@ let QuickEditorService = QuickEditorService_1 = class QuickEditorService {
             label: this.labelProvider.getName(uri),
             description: description,
             iconClasses,
-            ariaLabel: uri.path.toString(),
+            ariaLabel: uri.path.fsPath(),
             alwaysShow: true,
             execute: () => this.openFile(uri)
         };
@@ -92,8 +92,8 @@ __decorate([
     __metadata("design:type", Object)
 ], QuickEditorService.prototype, "quickAccessRegistry", void 0);
 __decorate([
-    (0, inversify_1.inject)(_1.EditorManager),
-    __metadata("design:type", _1.EditorManager)
+    (0, inversify_1.inject)(editor_manager_1.EditorManager),
+    __metadata("design:type", editor_manager_1.EditorManager)
 ], QuickEditorService.prototype, "editorManager", void 0);
 QuickEditorService = QuickEditorService_1 = __decorate([
     (0, inversify_1.injectable)()

package/lib/browser/quick-editor-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"quick-editor-service.js","sourceRoot":"","sources":["../../src/browser/quick-editor-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"quick-editor-service.js","sourceRoot":"","sources":["../../src/browser/quick-editor-service.ts"],"names":[],"mappings":"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"}

package/lib/common/language-selector.d.ts

@@ -0,0 +1,14 @@
+export interface RelativePattern {
+    base: string;
+    pattern: string;
+    pathToRelative(from: string, to: string): string;
+}
+export interface LanguageFilter {
+    language?: string;
+    scheme?: string;
+    pattern?: string | RelativePattern;
+    hasAccessToAllModels?: boolean;
+}
+export declare type LanguageSelector = string | LanguageFilter | (string | LanguageFilter)[];
+export declare function score(selector: LanguageSelector | undefined, uriScheme: string, path: string, candidateLanguage: string, candidateIsSynchronized: boolean): number;
+//# sourceMappingURL=language-selector.d.ts.map

package/lib/common/language-selector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"language-selector.d.ts","sourceRoot":"","sources":["../../src/common/language-selector.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACpD;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AACD,oBAAY,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,CAAC,MAAM,GAAG,cAAc,CAAC,EAAE,CAAC;AAErF,wBAAgB,KAAK,CAAC,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,uBAAuB,EAAE,OAAO,GAAG,MAAM,CAuElK"}

package/lib/common/language-selector.js

@@ -0,0 +1,91 @@
+"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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.score = void 0;
+const glob_1 = require("@theia/core/lib/common/glob");
+function score(selector, uriScheme, path, candidateLanguage, candidateIsSynchronized) {
+    if (Array.isArray(selector)) {
+        let ret = 0;
+        for (const filter of selector) {
+            const value = score(filter, uriScheme, path, candidateLanguage, candidateIsSynchronized);
+            if (value === 10) {
+                return value;
+            }
+            if (value > ret) {
+                ret = value;
+            }
+        }
+        return ret;
+    }
+    else if (typeof selector === 'string') {
+        if (!candidateIsSynchronized) {
+            return 0;
+        }
+        if (selector === '*') {
+            return 5;
+        }
+        else if (selector === candidateLanguage) {
+            return 10;
+        }
+        else {
+            return 0;
+        }
+    }
+    else if (selector) {
+        const { language, pattern, scheme, hasAccessToAllModels } = selector;
+        if (!candidateIsSynchronized && !hasAccessToAllModels) {
+            return 0;
+        }
+        let result = 0;
+        if (scheme) {
+            if (scheme === uriScheme) {
+                result = 10;
+            }
+            else if (scheme === '*') {
+                result = 5;
+            }
+            else {
+                return 0;
+            }
+        }
+        if (language) {
+            if (language === candidateLanguage) {
+                result = 10;
+            }
+            else if (language === '*') {
+                result = Math.max(result, 5);
+            }
+            else {
+                return 0;
+            }
+        }
+        if (pattern) {
+            if (pattern === path || (0, glob_1.match)(pattern, path)) {
+                result = 10;
+            }
+            else {
+                return 0;
+            }
+        }
+        return result;
+    }
+    else {
+        return 0;
+    }
+}
+exports.score = score;
+//# sourceMappingURL=language-selector.js.map

package/lib/common/language-selector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"language-selector.js","sourceRoot":"","sources":["../../src/common/language-selector.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,sDAAwE;AAgBxE,SAAgB,KAAK,CAAC,QAAsC,EAAE,SAAiB,EAAE,IAAY,EAAE,iBAAyB,EAAE,uBAAgC;IAEtJ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACzB,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,uBAAuB,CAAC,CAAC;YACzF,IAAI,KAAK,KAAK,EAAE,EAAE;gBACd,OAAO,KAAK,CAAC;aAChB;YACD,IAAI,KAAK,GAAG,GAAG,EAAE;gBACb,GAAG,GAAG,KAAK,CAAC;aACf;SACJ;QACD,OAAO,GAAG,CAAC;KAEd;SAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAErC,IAAI,CAAC,uBAAuB,EAAE;YAC1B,OAAO,CAAC,CAAC;SACZ;QAED,IAAI,QAAQ,KAAK,GAAG,EAAE;YAClB,OAAO,CAAC,CAAC;SACZ;aAAM,IAAI,QAAQ,KAAK,iBAAiB,EAAE;YACvC,OAAO,EAAE,CAAC;SACb;aAAM;YACH,OAAO,CAAC,CAAC;SACZ;KAEJ;SAAM,IAAI,QAAQ,EAAE;QACjB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,GAAG,QAAQ,CAAC;QAErE,IAAI,CAAC,uBAAuB,IAAI,CAAC,oBAAoB,EAAE;YACnD,OAAO,CAAC,CAAC;SACZ;QAED,IAAI,MAAM,GAAG,CAAC,CAAC;QAEf,IAAI,MAAM,EAAE;YACR,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,MAAM,GAAG,EAAE,CAAC;aACf;iBAAM,IAAI,MAAM,KAAK,GAAG,EAAE;gBACvB,MAAM,GAAG,CAAC,CAAC;aACd;iBAAM;gBACH,OAAO,CAAC,CAAC;aACZ;SACJ;QAED,IAAI,QAAQ,EAAE;YACV,IAAI,QAAQ,KAAK,iBAAiB,EAAE;gBAChC,MAAM,GAAG,EAAE,CAAC;aACf;iBAAM,IAAI,QAAQ,KAAK,GAAG,EAAE;gBACzB,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aAChC;iBAAM;gBACH,OAAO,CAAC,CAAC;aACZ;SACJ;QAED,IAAI,OAAO,EAAE;YACT,IAAI,OAAO,KAAK,IAAI,IAAI,IAAA,YAAgB,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE;gBACrD,MAAM,GAAG,EAAE,CAAC;aACf;iBAAM;gBACH,OAAO,CAAC,CAAC;aACZ;SACJ;QAED,OAAO,MAAM,CAAC;KAEjB;SAAM;QACH,OAAO,CAAC,CAAC;KACZ;AACL,CAAC;AAvED,sBAuEC"}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@theia/editor",
-  "version": "1.26.0-next.9+cd33db1fee0",
+  "version": "1.26.0",
   "description": "Theia - Editor Extension",
   "dependencies": {
-    "@theia/core": "1.26.0-next.9+cd33db1fee0",
-    "@theia/variable-resolver": "1.26.0-next.9+cd33db1fee0"
+    "@theia/core": "1.26.0",
+    "@theia/variable-resolver": "1.26.0"
   },
   "publishConfig": {
     "access": "public"
@@ -39,10 +39,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.25.0"
+    "@theia/ext-scripts": "1.26.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "cd33db1fee04ac1f922de81c5923e381b2579173"
+  "gitHead": "38e2466568e69d55a9c64c96878deff5a005b814"
 }

package/src/browser/editor-contribution.ts

@@ -26,18 +26,18 @@ import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { CommandHandler, DisposableCollection, MenuContribution, MenuModelRegistry } from '@theia/core';
 import { EditorCommands } from './editor-command';
 import { CommandRegistry, CommandContribution } from '@theia/core/lib/common';
-import { LanguageService } from '@theia/core/lib/browser/language-service';
 import { SUPPORTED_ENCODINGS } from '@theia/core/lib/browser/supported-encodings';
 import { nls } from '@theia/core/lib/common/nls';
 import { CurrentWidgetCommandAdapter } from '@theia/core/lib/browser/shell/current-widget-command-adapter';
 import { EditorWidget } from './editor-widget';
+import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
 
 @injectable()
 export class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
 
     @inject(StatusBar) protected readonly statusBar: StatusBar;
     @inject(EditorManager) protected readonly editorManager: EditorManager;
-    @inject(LanguageService) protected readonly languages: LanguageService;
+    @inject(EditorLanguageStatusService) protected readonly languageStatusService: EditorLanguageStatusService;
     @inject(ApplicationShell) protected readonly shell: ApplicationShell;
 
     @inject(ContextKeyService)
@@ -90,19 +90,7 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
     }
 
     protected updateLanguageStatus(editor: TextEditor | undefined): void {
-        if (!editor) {
-            this.statusBar.removeElement('editor-status-language');
-            return;
-        }
-        const language = this.languages.getLanguage(editor.document.languageId);
-        const languageName = language ? language.name : '';
-        this.statusBar.setElement('editor-status-language', {
-            text: languageName,
-            alignment: StatusBarAlignment.RIGHT,
-            priority: 1,
-            command: EditorCommands.CHANGE_LANGUAGE.id,
-            tooltip: nls.localizeByDefault('Select Language Mode')
-        });
+        this.languageStatusService.updateLanguageStatus(editor);
     }
 
     protected updateEncodingStatus(editor: TextEditor | undefined): void {

package/src/browser/editor-frontend-module.ts

@@ -15,6 +15,7 @@
 // *****************************************************************************
 
 import '../../src/browser/style/index.css';
+import '../../src/browser/language-status/editor-language-status.css';
 
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
@@ -35,6 +36,7 @@ import { NavigationLocationSimilarity } from './navigation/navigation-location-s
 import { EditorVariableContribution } from './editor-variable-contribution';
 import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
 import { QuickEditorService } from './quick-editor-service';
+import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
 
 export default new ContainerModule(bind => {
     bindEditorPreferences(bind);
@@ -60,6 +62,7 @@ export default new ContainerModule(bind => {
 
     bind(EditorContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(EditorContribution);
+    bind(EditorLanguageStatusService).toSelf().inSingletonScope();
 
     bind(EditorNavigationContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(EditorNavigationContribution);

package/src/browser/editor-navigation-contribution.ts

@@ -26,13 +26,14 @@ import { EditorManager } from './editor-manager';
 import { TextEditor, Position, Range, TextDocumentChangeEvent } from './editor';
 import { NavigationLocation, RecentlyClosedEditor } from './navigation/navigation-location';
 import { NavigationLocationService } from './navigation/navigation-location-service';
-import { PreferenceService, PreferenceScope } from '@theia/core/lib/browser';
+import { PreferenceService, PreferenceScope, addEventListener } from '@theia/core/lib/browser';
 
 @injectable()
 export class EditorNavigationContribution implements Disposable, FrontendApplicationContribution {
 
     private static ID = 'editor-navigation-contribution';
     private static CLOSED_EDITORS_KEY = 'recently-closed-editors';
+    private static MOUSE_NAVIGATION_PREFERENCE = 'workbench.editor.mouseBackForwardToNavigate';
 
     protected readonly toDispose = new DisposableCollection();
     protected readonly toDisposePerCurrentEditor = new DisposableCollection();
@@ -102,6 +103,39 @@ export class EditorNavigationContribution implements Disposable, FrontendApplica
         this.commandRegistry.registerHandler(EditorCommands.REOPEN_CLOSED_EDITOR.id, {
             execute: () => this.reopenLastClosedEditor()
         });
+
+        this.installMouseNavigationSupport();
+    }
+
+    protected async installMouseNavigationSupport(): Promise<void> {
+        const mouseNavigationSupport = new DisposableCollection();
+        const updateMouseNavigationListener = () => {
+            mouseNavigationSupport.dispose();
+            if (this.shouldNavigateWithMouse()) {
+                mouseNavigationSupport.push(addEventListener(document.body, 'mousedown', event => this.onMouseDown(event), true));
+            }
+        };
+        this.toDispose.push(this.preferenceService.onPreferenceChanged(change => {
+            if (change.preferenceName === EditorNavigationContribution.MOUSE_NAVIGATION_PREFERENCE) {
+                updateMouseNavigationListener();
+            }
+        }));
+        updateMouseNavigationListener();
+        this.toDispose.push(mouseNavigationSupport);
+    }
+
+    protected async onMouseDown(event: MouseEvent): Promise<void> {
+        // Support navigation in history when mouse buttons 4/5 are pressed
+        switch (event.button) {
+            case 3:
+                event.preventDefault();
+                this.locationStack.back();
+                break;
+            case 4:
+                event.preventDefault();
+                this.locationStack.forward();
+                break;
+        }
     }
 
     /**
@@ -274,4 +308,8 @@ export class EditorNavigationContribution implements Disposable, FrontendApplica
         return !!this.preferenceService.get('editor.history.persistClosedEditors');
     }
 
+    private shouldNavigateWithMouse(): boolean {
+        return !!this.preferenceService.get(EditorNavigationContribution.MOUSE_NAVIGATION_PREFERENCE);
+    }
+
 }

package/src/browser/editor-widget-factory.ts

@@ -71,7 +71,7 @@ export class EditorWidgetFactory implements WidgetFactory {
     }
 
     private setLabels(editor: EditorWidget, uri: URI): void {
-        editor.title.caption = uri.path.toString();
+        editor.title.caption = uri.path.fsPath();
         const icon = this.labelProvider.getIcon(uri);
         editor.title.label = this.labelProvider.getName(uri);
         editor.title.iconClass = icon + ' file-icon';